diff --git a/ci/docker/build/README.md b/ci/docker/build/README.md index 79f0d92708418..02a7fb345ed48 100644 --- a/ci/docker/build/README.md +++ b/ci/docker/build/README.md @@ -1,8 +1,8 @@ This directory includes scripts to build the docker container image used for building flutter/engine in our CI system (currently [Cirrus](cirrus-ci.org)). -In order to run the scripts, you have to setup `docker` and `gcloud`. Please -refer to internal doc go/installdocker for how to setup `docker` on gLinux. +In order to run the scripts, you have to set up `docker` and `gcloud`. Please +refer to internal doc go/installdocker for how to set up `docker` on gLinux. Cirrus will build (and cache) a Docker image based on this `Dockerfile` for Linux tasks using its diff --git a/examples/glfw/README.md b/examples/glfw/README.md index c38cae4617946..762e9c53afee4 100644 --- a/examples/glfw/README.md +++ b/examples/glfw/README.md @@ -24,6 +24,6 @@ In order to **build** and **run** the example you should be able to go into this ## Troubleshooting There are a few things you might have to tweak in order to get your build working: - * Flutter Engine Location - Inside the `CMakeList.txt` file you will see that it is setup to search for the header and library for the Flutter Engine in specific locations, those might not be the location of your Flutter Engine. + * Flutter Engine Location - Inside the `CMakeList.txt` file you will see that it is set up to search for the header and library for the Flutter Engine in specific locations, those might not be the location of your Flutter Engine. * Pixel Ratio - If the project runs but is drawing at the wrong scale you may have to tweak the `kPixelRatio` variable in `FlutterEmbedderGLFW.cc` file. * GLFW Location - Inside the `CMakeLists.txt` we are searching for the GLFW library, if CMake can't find it you may have to edit that. diff --git a/fml/platform/win/mapping_win.cc b/fml/platform/win/mapping_win.cc index 1497ddc3e4259..b32178f54d4e9 100644 --- a/fml/platform/win/mapping_win.cc +++ b/fml/platform/win/mapping_win.cc @@ -88,7 +88,7 @@ FileMapping::FileMapping(const fml::UniqueFD& fd, MapViewOfFile(mapping_handle_.get(), desired_access, 0, 0, mapping_size)); if (mapping == nullptr) { - FML_DLOG(ERROR) << "Could not setup file mapping. " + FML_DLOG(ERROR) << "Could not set up file mapping. " << GetLastErrorMessage(); return; } diff --git a/lib/ui/channel_buffers.dart b/lib/ui/channel_buffers.dart index afffab19e496b..9b15db89cf448 100644 --- a/lib/ui/channel_buffers.dart +++ b/lib/ui/channel_buffers.dart @@ -236,7 +236,7 @@ class _Channel { /// Messages for a channel are stored until a listener is provided for that channel, /// using [setListener]. Only one listener may be configured per channel. /// -/// Typically these buffers are drained once a callback is setup on +/// Typically these buffers are drained once a callback is set up on /// the [BinaryMessenger] in the Flutter framework. (See [setListener].) /// /// ## Buffer capacity and overflow @@ -381,7 +381,7 @@ class ChannelBuffers { /// Remove and process all stored messages for a given channel. /// /// This should be called once a channel is prepared to handle messages - /// (i.e. when a message handler is setup in the framework). + /// (i.e. when a message handler is set up in the framework). /// /// The messages are processed by calling the given `callback`. Each message /// is processed in its own microtask. diff --git a/lib/ui/painting/image_decoder_unittests.cc b/lib/ui/painting/image_decoder_unittests.cc index 2e37af243f254..d9cdbfab51380 100644 --- a/lib/ui/painting/image_decoder_unittests.cc +++ b/lib/ui/painting/image_decoder_unittests.cc @@ -40,7 +40,7 @@ class TestIOManager final : public IOManager { weak_factory_(this) { FML_CHECK(task_runner->RunsTasksOnCurrentThread()) << "The IO manager must be initialized its primary task runner. The " - "test harness may not be setup correctly/safely."; + "test harness may not be set up correctly/safely."; weak_prototype_ = weak_factory_.GetWeakPtr(); } diff --git a/lib/ui/painting/image_encoding.cc b/lib/ui/painting/image_encoding.cc index 8a7653f0b0bbb..90dbbb6f34bc0 100644 --- a/lib/ui/painting/image_encoding.cc +++ b/lib/ui/painting/image_encoding.cc @@ -172,7 +172,7 @@ sk_sp CopyImageByteData(sk_sp raster_image, color_type, kPremul_SkAlphaType, nullptr)); if (!surface) { - FML_LOG(ERROR) << "Could not setup the surface for swizzle."; + FML_LOG(ERROR) << "Could not set up the surface for swizzle."; return nullptr; } diff --git a/lib/web_ui/dev/integration_tests_manager.dart b/lib/web_ui/dev/integration_tests_manager.dart index c75a8b9689a75..4e4adb6cf6a12 100644 --- a/lib/web_ui/dev/integration_tests_manager.dart +++ b/lib/web_ui/dev/integration_tests_manager.dart @@ -351,7 +351,7 @@ class IntegrationTestsManager { print('ERROR: Test driver file named has ${expectedDriverName} ' 'not found under directory ${testDirectory.path}. Stopping the ' 'integration tests. Please add ${expectedDriverName}. Check to ' - 'README file on more details on how to setup integration tests.'); + 'README file on more details on how to set up integration tests.'); } throw StateError('Error in test files. Check the logs for ' 'further instructions'); diff --git a/lib/web_ui/lib/src/engine/dom_renderer.dart b/lib/web_ui/lib/src/engine/dom_renderer.dart index d87c8d68592eb..ce2a3154d5c88 100644 --- a/lib/web_ui/lib/src/engine/dom_renderer.dart +++ b/lib/web_ui/lib/src/engine/dom_renderer.dart @@ -454,7 +454,7 @@ flt-glass-pane * { if (html.window.visualViewport == null && isWebKit) { // Safari sometimes gives us bogus innerWidth/innerHeight values when the // page loads. When it changes the values to correct ones it does not - // notify of the change via `onResize`. As a workaround, we setup a + // notify of the change via `onResize`. As a workaround, we set up a // temporary periodic timer that polls innerWidth and triggers the // resizeListener so that the framework can react to the change. // @@ -464,7 +464,7 @@ flt-glass-pane * { // VisualViewport API is not enabled in Firefox as well. On the other hand // Firefox returns correct values for innerHeight, innerWidth. // Firefox also triggers html.window.onResize therefore we don't need this - // timer setup for Firefox. + // timer to be set up for Firefox. final int initialInnerWidth = html.window.innerWidth!; // Counts how many times we checked screen size. We check up to 5 times. int checkCount = 0; diff --git a/lib/web_ui/lib/src/engine/navigation/history.dart b/lib/web_ui/lib/src/engine/navigation/history.dart index d6623bb686a4c..3d5ea02569c0f 100644 --- a/lib/web_ui/lib/src/engine/navigation/history.dart +++ b/lib/web_ui/lib/src/engine/navigation/history.dart @@ -217,8 +217,8 @@ class SingleEntryBrowserHistory extends BrowserHistory { if (!_isFlutterEntry(html.window.history.state)) { // An entry may not have come from Flutter, for example, when the user // refreshes the page. They land directly on the "flutter" entry, so - // there's no need to setup the "origin" and "flutter" entries, we can - // safely assume they are already setup. + // there's no need to set up the "origin" and "flutter" entries, we can + // safely assume they are already set up. _setupOriginEntry(strategy); _setupFlutterEntry(strategy, replace: false, path: path); } diff --git a/lib/web_ui/lib/src/engine/text/measurement.dart b/lib/web_ui/lib/src/engine/text/measurement.dart index 174145222f4c8..819c0c9d07adc 100644 --- a/lib/web_ui/lib/src/engine/text/measurement.dart +++ b/lib/web_ui/lib/src/engine/text/measurement.dart @@ -70,7 +70,7 @@ class RulerManager extends RulerHost { /// The cache of rulers used to measure text. /// - /// Each ruler is keyed by paragraph style. This allows us to setup the + /// Each ruler is keyed by paragraph style. This allows us to set up the /// ruler's DOM structure once during the very first measurement of a given /// paragraph style. Subsequent measurements could reuse the same ruler and /// only swap the text contents. This minimizes the amount of work a browser diff --git a/lib/web_ui/lib/src/engine/text/ruler.dart b/lib/web_ui/lib/src/engine/text/ruler.dart index 8f597c47d2e35..5cab058ab6d4d 100644 --- a/lib/web_ui/lib/src/engine/text/ruler.dart +++ b/lib/web_ui/lib/src/engine/text/ruler.dart @@ -361,7 +361,7 @@ class TextDimensions { _invalidateBoundsCache(); } - /// Appends element and probe to hostElement that is setup for a specific + /// Appends element and probe to hostElement that is set up for a specific /// TextStyle. void appendToHost(html.HtmlElement hostElement) { hostElement.append(_element); diff --git a/lib/web_ui/test/engine/history_test.dart b/lib/web_ui/test/engine/history_test.dart index 037d7fd2cc48c..85dd035656821 100644 --- a/lib/web_ui/test/engine/history_test.dart +++ b/lib/web_ui/test/engine/history_test.dart @@ -60,7 +60,7 @@ void testMain() { // There should be two entries: origin and flutter. expect(strategy.history, hasLength(2)); - // The origin entry is setup but its path should remain unchanged. + // The origin entry is set up but its path should remain unchanged. final TestHistoryEntry originEntry = strategy.history[0]; expect(originEntry.state, _wrapOriginState('initial state')); expect(originEntry.url, '/initial'); diff --git a/runtime/dart_isolate.cc b/runtime/dart_isolate.cc index 39a11dffacb1c..68d27d11e86fb 100644 --- a/runtime/dart_isolate.cc +++ b/runtime/dart_isolate.cc @@ -1076,9 +1076,10 @@ bool DartIsolate::InitializeIsolate( return false; } - // Root isolates will be setup by the engine and the service isolate (which is - // also a root isolate) by the utility routines in the VM. However, secondary - // isolates will be run by the VM if they are marked as runnable. + // Root isolates will be set up by the engine and the service isolate + // (which is also a root isolate) by the utility routines in the VM. + // However, secondary isolates will be run by the VM if they are + // marked as runnable. if (!embedder_isolate->IsRootIsolate()) { auto child_isolate_preparer = embedder_isolate->GetIsolateGroupData().GetChildIsolatePreparer(); diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 228f7b9159d13..3758d34c93899 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -254,7 +254,7 @@ std::shared_ptr DartVM::Create( ); if (!vm_data) { - FML_LOG(ERROR) << "Could not setup VM data to bootstrap the VM from."; + FML_LOG(ERROR) << "Could not set up VM data to bootstrap the VM from."; return {}; } diff --git a/runtime/runtime_controller.cc b/runtime/runtime_controller.cc index dcf1be6a3bf55..d9abb720e1f21 100644 --- a/runtime/runtime_controller.cc +++ b/runtime/runtime_controller.cc @@ -429,7 +429,7 @@ bool RuntimeController::LaunchRootIsolate( tonic::DartState::Scope scope(strong_root_isolate); platform_configuration->DidCreateIsolate(); if (!FlushRuntimeStateToIsolate()) { - FML_DLOG(ERROR) << "Could not setup initial isolate state."; + FML_DLOG(ERROR) << "Could not set up initial isolate state."; } } else { FML_DCHECK(false) << "RuntimeController created without window binding."; diff --git a/shell/common/engine.h b/shell/common/engine.h index 10564764e201c..2043a11569a42 100644 --- a/shell/common/engine.h +++ b/shell/common/engine.h @@ -115,7 +115,8 @@ class Engine final : public RuntimeDelegate, /// /// * AOT assets give to JIT/DBC mode VM's and vice-versa. /// * The assets could not be found in the asset manager. Callers must make - /// sure their run configuration asset managers have been correctly setup. + /// sure their run configuration asset managers have been correctly set + /// up. /// * The assets themselves were corrupt or invalid. Callers must make sure /// their asset delivery mechanisms are sound. /// * The application entry-point or the root library of the entry-point diff --git a/shell/common/platform_view.cc b/shell/common/platform_view.cc index 27a398e5cdbcb..5441184543040 100644 --- a/shell/common/platform_view.cc +++ b/shell/common/platform_view.cc @@ -95,7 +95,7 @@ void PlatformView::NotifyDestroyed() { } sk_sp PlatformView::CreateResourceContext() const { - FML_DLOG(WARNING) << "This platform does not setup the resource " + FML_DLOG(WARNING) << "This platform does not set up the resource " "context on the IO thread for async texture uploads."; return nullptr; } diff --git a/shell/common/platform_view.h b/shell/common/platform_view.h index ea75883702145..4d05b92bb74ec 100644 --- a/shell/common/platform_view.h +++ b/shell/common/platform_view.h @@ -60,7 +60,7 @@ class PlatformView { /// with the given render surface. This surface is platform /// (iOS, Android) and client-rendering API (OpenGL, Software, /// Metal, Vulkan) specific. This is usually a sign to the - /// rasterizer to setup and begin rendering to that surface. + /// rasterizer to set up and begin rendering to that surface. /// /// @param[in] surface The surface /// diff --git a/shell/common/rasterizer.h b/shell/common/rasterizer.h index b853e6628e4f8..9e2532f09b83a 100644 --- a/shell/common/rasterizer.h +++ b/shell/common/rasterizer.h @@ -119,7 +119,7 @@ class Rasterizer final : public SnapshotDelegate { //---------------------------------------------------------------------------- /// @brief Destroys the rasterizer. This must happen on the raster task /// runner. All GPU resources are collected before this call - /// returns. Any context setup by the embedder to hold these + /// returns. Any context set up by the embedder to hold these /// resources can be immediately collected as well. /// ~Rasterizer(); @@ -132,7 +132,7 @@ class Rasterizer final : public SnapshotDelegate { /// call. No rendering may occur before this call. The surface is /// held till the balancing call to `Rasterizer::Teardown` is /// made. Calling a setup before tearing down the previous surface - /// (if this is not the first time the surface has been setup) is + /// (if this is not the first time the surface has been set up) is /// user error. /// /// @see `Rasterizer::Teardown` @@ -142,7 +142,7 @@ class Rasterizer final : public SnapshotDelegate { void Setup(std::unique_ptr surface); //---------------------------------------------------------------------------- - /// @brief Releases the previously setup on-screen render surface and + /// @brief Releases the previously set up on-screen render surface and /// collects associated resources. No more rendering may occur /// till the next call to `Rasterizer::Setup` with a new render /// surface. Calling a teardown without a setup is user error. diff --git a/shell/common/shell.cc b/shell/common/shell.cc index 07c4172c60249..5a2201d88e120 100644 --- a/shell/common/shell.cc +++ b/shell/common/shell.cc @@ -79,7 +79,7 @@ void Tokenize(const std::string& input, } // Though there can be multiple shells, some settings apply to all components in -// the process. These have to be setup before the shell or any of its +// the process. These have to be set up before the shell or any of its // sub-components can be initialized. In a perfect world, this would be empty. // TODO(chinmaygarde): The unfortunate side effect of this call is that settings // that cause shell initialization failures will still lead to some of their diff --git a/shell/common/shell.h b/shell/common/shell.h index 4febfa4e8e659..77bc7605acda1 100644 --- a/shell/common/shell.h +++ b/shell/common/shell.h @@ -263,10 +263,10 @@ class Shell final : public PlatformView::Delegate, /// @brief Used by embedders to check if all shell subcomponents are /// initialized. It is the embedder's responsibility to make this /// call before accessing any other shell method. A shell that is - /// not setup must be discarded and another one created with + /// not set up must be discarded and another one created with /// updated settings. /// - /// @return Returns if the shell has been setup. Once set up, this does + /// @return Returns if the shell has been set up. Once set up, this does /// not change for the life-cycle of the shell. /// bool IsSetup() const; diff --git a/shell/common/shell_benchmarks.cc b/shell/common/shell_benchmarks.cc index ec93f37d166f3..21cf71147f575 100644 --- a/shell/common/shell_benchmarks.cc +++ b/shell/common/shell_benchmarks.cc @@ -32,7 +32,7 @@ static void StartupAndShutdownShell(benchmark::State& state, aot_symbols = testing::LoadELFSymbolFromFixturesIfNeccessary(); FML_CHECK( testing::PrepareSettingsForAOTWithSymbols(settings, aot_symbols)) - << "Could not setup settings with AOT symbols."; + << "Could not set up settings with AOT symbols."; } else { settings.application_kernels = [&]() { std::vector> kernel_mappings; diff --git a/shell/common/shell_test_platform_view_vulkan.cc b/shell/common/shell_test_platform_view_vulkan.cc index 9a296b6663c0a..4e98f9ea1824e 100644 --- a/shell/common/shell_test_platform_view_vulkan.cc +++ b/shell/common/shell_test_platform_view_vulkan.cc @@ -78,9 +78,9 @@ ShellTestPlatformViewVulkan::OffScreenSurface::OffScreenSurface( VK_MAKE_VERSION(1, 1, 0), true); if (!application_->IsValid() || !vk_->AreInstanceProcsSetup()) { - // Make certain the application instance was created and it setup the + // Make certain the application instance was created and it set up the // instance proc table entries. - FML_DLOG(ERROR) << "Instance proc addresses have not been setup."; + FML_DLOG(ERROR) << "Instance proc addresses have not been set up."; return; } @@ -90,9 +90,9 @@ ShellTestPlatformViewVulkan::OffScreenSurface::OffScreenSurface( if (logical_device_ == nullptr || !logical_device_->IsValid() || !vk_->AreDeviceProcsSetup()) { - // Make certain the device was created and it setup the device proc table + // Make certain the device was created and it set up the device proc table // entries. - FML_DLOG(ERROR) << "Device proc addresses have not been setup."; + FML_DLOG(ERROR) << "Device proc addresses have not been set up."; return; } diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc index a92c9359b7e01..a7d1e4d444cc5 100644 --- a/shell/gpu/gpu_surface_gl.cc +++ b/shell/gpu/gpu_surface_gl.cc @@ -39,7 +39,7 @@ sk_sp GPUSurfaceGL::MakeGLContext( auto context_switch = delegate->GLContextMakeCurrent(); if (!context_switch->GetResult()) { FML_LOG(ERROR) - << "Could not make the context current to setup the gr context."; + << "Could not make the context current to set up the Gr context."; return nullptr; } @@ -64,7 +64,7 @@ sk_sp GPUSurfaceGL::MakeGLContext( auto context = GrDirectContext::MakeGL(delegate->GetGLInterface(), options); if (!context) { - FML_LOG(ERROR) << "Failed to setup Skia Gr context."; + FML_LOG(ERROR) << "Failed to set up Skia Gr context."; return nullptr; } @@ -99,7 +99,7 @@ GPUSurfaceGL::GPUSurfaceGL(sk_sp gr_context, auto context_switch = delegate_->GLContextMakeCurrent(); if (!context_switch->GetResult()) { FML_LOG(ERROR) - << "Could not make the context current to setup the gr context."; + << "Could not make the context current to set up the Gr context."; return; } @@ -168,7 +168,7 @@ static sk_sp WrapOnscreenSurface(GrDirectContext* context, SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry); return SkSurface::MakeFromBackendRenderTarget( - context, // gr context + context, // Gr context render_target, // render target GrSurfaceOrigin::kBottomLeft_GrSurfaceOrigin, // origin color_type, // color type diff --git a/shell/platform/android/external_view_embedder/surface_pool.cc b/shell/platform/android/external_view_embedder/surface_pool.cc index a7d5f11806dcb..27426c982869f 100644 --- a/shell/platform/android/external_view_embedder/surface_pool.cc +++ b/shell/platform/android/external_view_embedder/surface_pool.cc @@ -36,7 +36,7 @@ std::shared_ptr SurfacePool::GetLayer( surface_factory->CreateSurface(); FML_CHECK(android_surface && android_surface->IsValid()) - << "Could not create an OpenGL, Vulkan or Software surface to setup " + << "Could not create an OpenGL, Vulkan or Software surface to set up " "rendering."; std::unique_ptr java_metadata = diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java index 01797d6768fb7..68be1decccb22 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java @@ -357,8 +357,8 @@ private native FlutterJNI nativeSpawn( * *

This method must not be invoked if {@code FlutterJNI} is not already attached to native. * - *

Invoking this method will result in the release of all native-side resources that were setup - * during {@link #attachToNative(boolean)} or {@link #spawn(String, String)}, or accumulated + *

Invoking this method will result in the release of all native-side resources that were set + * up during {@link #attachToNative(boolean)} or {@link #spawn(String, String)}, or accumulated * thereafter. * *

It is permissable to re-attach this instance to native after detaching it from native. diff --git a/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java b/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java index 43ba7e5591d41..55eb3109af5bb 100644 --- a/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java +++ b/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java @@ -106,8 +106,8 @@ public void setMessageHandler(@Nullable final MessageHandler handler) { /** * Adjusts the number of messages that will get buffered when sending messages to channels that - * aren't fully setup yet. For example, the engine isn't running yet or the channel's message - * handler isn't setup on the Dart side yet. + * aren't fully set up yet. For example, the engine isn't running yet or the channel's message + * handler isn't set up on the Dart side yet. */ public void resizeChannelBuffer(int newSize) { resizeChannelBuffer(messenger, name, newSize); diff --git a/shell/platform/android/io/flutter/plugin/common/EventChannel.java b/shell/platform/android/io/flutter/plugin/common/EventChannel.java index 34f02a1b83e58..05dae1c01b3fd 100644 --- a/shell/platform/android/io/flutter/plugin/common/EventChannel.java +++ b/shell/platform/android/io/flutter/plugin/common/EventChannel.java @@ -88,7 +88,7 @@ public void setStreamHandler(final StreamHandler handler) { } /** - * Handler of stream setup and tear-down requests. + * Handler of stream setup and teardown requests. * *

Implementations must be prepared to accept sequences of alternating calls to {@link * #onListen(Object, EventSink)} and {@link #onCancel(Object)}. Implementations should ideally diff --git a/shell/platform/android/io/flutter/plugin/common/MethodChannel.java b/shell/platform/android/io/flutter/plugin/common/MethodChannel.java index ab2a917235a2e..901299b943019 100644 --- a/shell/platform/android/io/flutter/plugin/common/MethodChannel.java +++ b/shell/platform/android/io/flutter/plugin/common/MethodChannel.java @@ -122,8 +122,8 @@ public void setMethodCallHandler(final @Nullable MethodCallHandler handler) { /** * Adjusts the number of messages that will get buffered when sending messages to channels that - * aren't fully setup yet. For example, the engine isn't running yet or the channel's message - * handler isn't setup on the Dart side yet. + * aren't fully set up yet. For example, the engine isn't running yet or the channel's message + * handler isn't set up on the Dart side yet. */ public void resizeChannelBuffer(int newSize) { BasicMessageChannel.resizeChannelBuffer(messenger, name, newSize); diff --git a/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java b/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java index 698be1c1a8b57..c4d5ad39255a7 100644 --- a/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java +++ b/shell/platform/android/io/flutter/plugin/editing/TextInputPlugin.java @@ -601,7 +601,7 @@ public void didChangeEditingState( // -------- Start: Autofill ------- // ### Setup and provide the initial text values and hints. // - // The TextInputConfiguration used to setup the current client is also used for populating + // The TextInputConfiguration used to set up the current client is also used for populating // "AutofillVirtualStructure" when requested by the autofill manager (AFM), See // #onProvideAutofillVirtualStructure. // diff --git a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java index 6790e5e68e116..6e77938b7a3cc 100644 --- a/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java +++ b/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java @@ -430,7 +430,7 @@ public PlatformViewsController() { * controller. This should be the context of the Activity hosting the Flutter application. * @param textureRegistry The texture registry which provides the output textures into which the * embedded views will be rendered. - * @param dartExecutor The dart execution context, which is used to setup a system channel. + * @param dartExecutor The dart execution context, which is used to set up a system channel. */ public void attach( Context context, TextureRegistry textureRegistry, @NonNull DartExecutor dartExecutor) { diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index 5cd0d66403edd..59711aabd7880 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -214,7 +214,7 @@ public void surfaceDestroyed(SurfaceHolder holder) { systemChannel = new SystemChannel(dartExecutor); settingsChannel = new SettingsChannel(dartExecutor); - // Create and setup plugins + // Create and set up plugins PlatformPlugin platformPlugin = new PlatformPlugin(activity, platformChannel); addActivityLifecycleListener( new ActivityLifecycleListener() { diff --git a/shell/platform/android/platform_view_android.cc b/shell/platform/android/platform_view_android.cc index e7b25f75393ef..1e9e47637743e 100644 --- a/shell/platform/android/platform_view_android.cc +++ b/shell/platform/android/platform_view_android.cc @@ -117,7 +117,7 @@ std::unique_ptr PlatformViewAndroid::MakeSurface( auto surface = surface_factory->CreateSurface(); FML_CHECK(surface && surface->IsValid()) - << "Could not create an OpenGL, Vulkan or Software surface to setup " + << "Could not create an OpenGL, Vulkan or Software surface to set up " "rendering."; return surface; } diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java index 848ad8505495e..b88b38dbe84e7 100644 --- a/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java +++ b/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityAndFragmentDelegateTest.java @@ -402,7 +402,7 @@ public void itSendsPopRouteMessageToFlutterWhenHardwareBackButtonIsPressed() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and inform our delegate that the back button was pressed. @@ -418,7 +418,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. @@ -446,7 +446,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate app start. delegate.onStart(); @@ -473,7 +473,7 @@ public void itForwardsOnRequestPermissionsResultToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate app start. delegate.onStart(); @@ -498,7 +498,7 @@ public void itSendsdefaultInitialRouteOnStartIfNotDeepLinkingFromIntent() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate app start. delegate.onStart(); @@ -514,7 +514,7 @@ public void itSendsPushRouteMessageWhenOnNewIntent() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); Intent mockIntent = mock(Intent.class); @@ -534,7 +534,7 @@ public void itSendsPushRouteMessageWhenOnNewIntentNoQueryParameter() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); Intent mockIntent = mock(Intent.class); @@ -552,7 +552,7 @@ public void itForwardsOnNewIntentToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. @@ -568,7 +568,7 @@ public void itForwardsOnActivityResultToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. @@ -585,7 +585,7 @@ public void itForwardsOnUserLeaveHintToFlutterEngine() { FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. @@ -601,7 +601,7 @@ public void itNotifiesDartExecutorAndSendsMessageOverSystemChannelWhenToldToTrim FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. @@ -624,7 +624,7 @@ public void itNotifiesDartExecutorAndSendsMessageOverSystemChannelWhenInformedOf FlutterActivityAndFragmentDelegate delegate = new FlutterActivityAndFragmentDelegate(mockHost); // --- Execute the behavior under test --- - // The FlutterEngine is setup in onAttach(). + // The FlutterEngine is set up in onAttach(). delegate.onAttach(RuntimeEnvironment.application); // Emulate the host and call the method that we expect to be forwarded. diff --git a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java index 6037ca8c4e11e..957b73969fd26 100644 --- a/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java +++ b/shell/platform/android/test/io/flutter/embedding/engine/FlutterEngineConnectionRegistryTest.java @@ -79,7 +79,7 @@ public void activityResultListenerCanBeRemovedFromListener() { Intent intent = mock(Intent.class); AtomicBoolean isFirstCall = new AtomicBoolean(true); - // setup the environment to get the required internal data + // Set up the environment to get the required internal data FlutterEngineConnectionRegistry registry = new FlutterEngineConnectionRegistry(context, flutterEngine, flutterLoader); FakeActivityAwareFlutterPlugin fakePlugin = new FakeActivityAwareFlutterPlugin(); diff --git a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h index 652670d62848c..9eced6cf7061e 100644 --- a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h +++ b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler.h @@ -25,7 +25,7 @@ struct StreamHandlerError { error_details(error_details) {} }; -// Handler of stream setup and tear-down requests. +// Handler for stream setup and teardown requests. // Implementations must be prepared to accept sequences of alternating calls to // OnListen() and OnCancel(). Implementations should ideally consume no // resources when the last such call is not OnListen(). In typical situations, diff --git a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h index 60550d1603b44..fde4ce4410d25 100644 --- a/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h +++ b/shell/platform/common/client_wrapper/include/flutter/event_stream_handler_functions.h @@ -14,7 +14,7 @@ namespace flutter { class EncodableValue; -// Handler types for each of the StreamHandler setup and tear-down +// Handler types for each of the StreamHandler setup and teardown // requests. template using StreamHandlerListen = diff --git a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h index c552575090eb6..8b24faed0f961 100644 --- a/shell/platform/darwin/common/framework/Headers/FlutterChannels.h +++ b/shell/platform/darwin/common/framework/Headers/FlutterChannels.h @@ -117,8 +117,8 @@ FLUTTER_DARWIN_EXPORT /** * Adjusts the number of messages that will get buffered when sending messages to - * channels that aren't fully setup yet. For example, the engine isn't running - * yet or the channel's message handler isn't setup on the Dart side yet. + * channels that aren't fully set up yet. For example, the engine isn't running + * yet or the channel's message handler isn't set up on the Dart side yet. */ - (void)resizeChannelBuffer:(NSInteger)newSize; @@ -255,8 +255,8 @@ FLUTTER_DARWIN_EXPORT /** * Adjusts the number of messages that will get buffered when sending messages to - * channels that aren't fully setup yet. For example, the engine isn't running - * yet or the channel's message handler isn't setup on the Dart side yet. + * channels that aren't fully set up yet. For example, the engine isn't running + * yet or the channel's message handler isn't set up on the Dart side yet. */ - (void)resizeChannelBuffer:(NSInteger)newSize; diff --git a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm index 23e56fdc41dc7..d635988dde9de 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterEngine.mm @@ -824,7 +824,7 @@ - (FlutterBinaryMessengerConnection)setMessageHandlerOnChannel:(NSString*)channe return _connections->AquireConnection(channel.UTF8String); } else { NSAssert(!handler, @"Setting a message handler before the FlutterEngine has been run."); - // Setting a handler to nil for a not setup channel is a noop. + // Setting a handler to nil for a channel that has not yet been set up is a no-op. return flutter::ConnectionCollection::MakeErrorConnection(-1); } } diff --git a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm index 91c73b0b3bcf3..4f562cb5293f6 100644 --- a/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm +++ b/shell/platform/darwin/ios/framework/Source/FlutterViewController.mm @@ -84,7 +84,7 @@ @implementation FlutterViewController { fml::scoped_nsobject _engine; // We keep a separate reference to this and create it ahead of time because we want to be able to - // setup a shell along with its platform view before the view has to appear. + // set up a shell along with its platform view before the view has to appear. fml::scoped_nsobject _flutterView; fml::scoped_nsobject _splashScreenView; fml::ScopedBlock _flutterViewRenderedCallback; diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm index e5abef7b403e3..64f9058c1c3ef 100644 --- a/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm +++ b/shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureUnittests.mm @@ -21,19 +21,19 @@ namespace flutter::testing { TEST(FlutterEmbedderExternalTextureUnittests, TestTextureResolution) { - // constants. + // Constants. const size_t width = 100; const size_t height = 100; const int64_t texture_id = 1; - // setup the surface. + // Set up the surface. FlutterDarwinContextMetal* darwinContextMetal = [[FlutterDarwinContextMetal alloc] initWithDefaultMTLDevice]; SkImageInfo info = SkImageInfo::MakeN32Premul(width, height); GrDirectContext* grContext = darwinContextMetal.mainContext.get(); sk_sp gpuSurface(SkSurface::MakeRenderTarget(grContext, SkBudgeted::kNo, info)); - // create a texture. + // Create a texture. MTLTextureDescriptor* textureDescriptor = [[MTLTextureDescriptor alloc] init]; textureDescriptor.pixelFormat = MTLPixelFormatBGRA8Unorm; textureDescriptor.width = width; @@ -45,7 +45,7 @@ (__bridge FlutterMetalTextureHandle)mtlTexture, }; - // callback to resolve the texture. + // Callback to resolve the texture. EmbedderExternalTextureMetal::ExternalTextureCallback callback = [&](int64_t texture_id, size_t w, size_t h) { EXPECT_TRUE(w == width); @@ -62,7 +62,7 @@ return std::unique_ptr(texture); }; - // render the texture. + // Render the texture. std::unique_ptr texture = std::make_unique(texture_id, callback); SkRect bounds = SkRect::MakeWH(info.width(), info.height()); diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc index 20522a25710b8..e3d3408f54691 100644 --- a/shell/platform/embedder/embedder.cc +++ b/shell/platform/embedder/embedder.cc @@ -1193,7 +1193,7 @@ FlutterEngineResult FlutterEngineInitialize(size_t version, if (!thread_host || !thread_host->IsValid()) { return LOG_EMBEDDER_ERROR(kInvalidArguments, - "Could not setup or infer thread configuration " + "Could not set up or infer thread configuration " "to run the Flutter engine on."); } diff --git a/shell/platform/embedder/tests/embedder_test_context.cc b/shell/platform/embedder/tests/embedder_test_context.cc index f4e35bbfb9764..71503ae4ef31a 100644 --- a/shell/platform/embedder/tests/embedder_test_context.cc +++ b/shell/platform/embedder/tests/embedder_test_context.cc @@ -174,8 +174,8 @@ FlutterTransformation EmbedderTestContext::GetRootSurfaceTransformation() { EmbedderTestCompositor& EmbedderTestContext::GetCompositor() { FML_CHECK(compositor_) - << "Accessed the compositor on a context where one was not setup. Use " - "the config builder to setup a context with a custom compositor."; + << "Accessed the compositor on a context where one was not set up. Use " + "the config builder to set up a context with a custom compositor."; return *compositor_; } diff --git a/shell/platform/embedder/tests/embedder_test_context_gl.cc b/shell/platform/embedder/tests/embedder_test_context_gl.cc index e5eef963f8636..243e1d98644f7 100644 --- a/shell/platform/embedder/tests/embedder_test_context_gl.cc +++ b/shell/platform/embedder/tests/embedder_test_context_gl.cc @@ -110,9 +110,9 @@ uint32_t EmbedderTestContextGL::GetWindowFBOId() const { } void EmbedderTestContextGL::SetupCompositor() { - FML_CHECK(!compositor_) << "Already ssetup a compositor in this context."; + FML_CHECK(!compositor_) << "Already set up a compositor in this context."; FML_CHECK(gl_surface_) - << "Setup the GL surface before setting up a compositor."; + << "Set up the GL surface before setting up a compositor."; compositor_ = std::make_unique( gl_surface_->GetSurfaceSize(), gl_surface_->GetGrContext()); } diff --git a/shell/platform/embedder/tests/embedder_test_context_software.cc b/shell/platform/embedder/tests/embedder_test_context_software.cc index 9ac6e62d44020..1bb3bf5c8aea7 100644 --- a/shell/platform/embedder/tests/embedder_test_context_software.cc +++ b/shell/platform/embedder/tests/embedder_test_context_software.cc @@ -43,7 +43,7 @@ void EmbedderTestContextSoftware::SetupSurface(SkISize surface_size) { } void EmbedderTestContextSoftware::SetupCompositor() { - FML_CHECK(!compositor_) << "Already setup a compositor in this context."; + FML_CHECK(!compositor_) << "Already set up a compositor in this context."; compositor_ = std::make_unique(surface_size_); } diff --git a/shell/platform/embedder/tests/embedder_unittests_gl.cc b/shell/platform/embedder/tests/embedder_unittests_gl.cc index 80c7d9c0cbc7c..95ea662e06390 100644 --- a/shell/platform/embedder/tests/embedder_unittests_gl.cc +++ b/shell/platform/embedder/tests/embedder_unittests_gl.cc @@ -2493,7 +2493,7 @@ TEST_F(EmbedderTest, ClipsAreCorrectlyCalculated) { [&](const auto& mutation) { FlutterRect clip = mutation.clip_rect; - // The test is only setup to supply one clip. Make sure it is + // The test is only set up to supply one clip. Make sure it is // the one we expect. const auto rect_to_compare = SkRect::MakeLTRB(10.0, 10.0, 390, 290); diff --git a/shell/platform/fuchsia/dart_runner/builtin_libraries.cc b/shell/platform/fuchsia/dart_runner/builtin_libraries.cc index 8b07751e31a16..af40603c0f148 100644 --- a/shell/platform/fuchsia/dart_runner/builtin_libraries.cc +++ b/shell/platform/fuchsia/dart_runner/builtin_libraries.cc @@ -151,7 +151,7 @@ void InitBuiltinLibrariesForIsolate( // AOT: These steps already happened at compile time in gen_snapshot. // We need to ensure that all the scripts loaded so far are finalized - // as we are about to invoke some Dart code below to setup closures. + // as we are about to invoke some Dart code below to set up closures. result = Dart_FinalizeLoading(false); FML_CHECK(!tonic::LogIfError(result)); #endif diff --git a/shell/platform/fuchsia/flutter/engine.cc b/shell/platform/fuchsia/flutter/engine.cc index 0df1d1e5584f9..cddd5cde4a53e 100644 --- a/shell/platform/fuchsia/flutter/engine.cc +++ b/shell/platform/fuchsia/flutter/engine.cc @@ -129,7 +129,7 @@ Engine::Engine(Delegate& delegate, }; // Set up the session connection and other Scenic helpers on the raster - // thread. We also need to wait for the external view embedder to be setup + // thread. We also need to wait for the external view embedder to be set up // before creating the shell. fml::AutoResetWaitableEvent view_embedder_latch; task_runners.GetRasterTaskRunner()->PostTask(fml::MakeCopyable( @@ -353,7 +353,7 @@ Engine::Engine(Delegate& delegate, return; } - // Shell has been created. Before we run the engine, setup the isolate + // Shell has been created. Before we run the engine, set up the isolate // configurator. { fuchsia::sys::EnvironmentPtr environment; diff --git a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc index a48c7b040226b..ad38223a351d7 100644 --- a/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc +++ b/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc @@ -73,9 +73,9 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) { VK_MAKE_VERSION(1, 1, 0), true /* enable_validation_layers */); if (!application_->IsValid() || !vk_->AreInstanceProcsSetup()) { - // Make certain the application instance was created and it setup the + // Make certain the application instance was created and it set up the // instance proc table entries. - FML_LOG(ERROR) << "Instance proc addresses have not been setup."; + FML_LOG(ERROR) << "Instance proc addresses have not been set up."; return false; } @@ -85,9 +85,9 @@ bool VulkanSurfaceProducer::Initialize(scenic::Session* scenic_session) { if (logical_device_ == nullptr || !logical_device_->IsValid() || !vk_->AreDeviceProcsSetup()) { - // Make certain the device was created and it setup the device proc table + // Make certain the device was created and it set up the device proc table // entries. - FML_LOG(ERROR) << "Device proc addresses have not been setup."; + FML_LOG(ERROR) << "Device proc addresses have not been set up."; return false; } diff --git a/shell/testing/tester_main.cc b/shell/testing/tester_main.cc index 3b55f04289bcf..d775bc4c97170 100644 --- a/shell/testing/tester_main.cc +++ b/shell/testing/tester_main.cc @@ -152,7 +152,7 @@ int RunTester(const flutter::Settings& settings, ); if (!shell || !shell->IsSetup()) { - FML_LOG(ERROR) << "Could not setup the shell."; + FML_LOG(ERROR) << "Could not set up the shell."; return EXIT_FAILURE; } diff --git a/testing/dart_isolate_runner.cc b/testing/dart_isolate_runner.cc index 86f6c66892e9f..4ce157ee8ec43 100644 --- a/testing/dart_isolate_runner.cc +++ b/testing/dart_isolate_runner.cc @@ -94,7 +94,7 @@ std::unique_ptr RunDartCodeInIsolateOnUITaskRunner( auto kernel_mapping = std::make_unique(kernel_file); if (kernel_mapping->GetMapping() == nullptr) { - FML_LOG(ERROR) << "Could not setup kernel mapping."; + FML_LOG(ERROR) << "Could not set up kernel mapping."; return nullptr; } diff --git a/third_party/accessibility/ax/ax_node_position_unittest.cc b/third_party/accessibility/ax/ax_node_position_unittest.cc index 159e8b7c80778..210d8441e2f5b 100644 --- a/third_party/accessibility/ax/ax_node_position_unittest.cc +++ b/third_party/accessibility/ax/ax_node_position_unittest.cc @@ -1564,7 +1564,7 @@ TEST_F(AXPositionTest, AtStartAndEndOfLineInsideTextField) { // This test ensures that "AtStart/EndOfLine" methods work properly when at // the start or end of a text field. // - // We setup a test tree with two text fields. The first one has one line of + // We set up a test tree with two text fields. The first one has one line of // text, and the second one three. There are inline text boxes containing only // white space at the start and end of both text fields, which is a valid // AXTree that might be generated by our renderer. diff --git a/vulkan/vulkan_application.cc b/vulkan/vulkan_application.cc index 3a1e4b1132051..38560ac2ad08c 100644 --- a/vulkan/vulkan_application.cc +++ b/vulkan/vulkan_application.cc @@ -100,9 +100,9 @@ VulkanApplication::VulkanApplication( return; } - // Now that we have an instance, setup instance proc table entries. + // Now that we have an instance, set up instance proc table entries. if (!vk.SetupInstanceProcAddresses(instance)) { - FML_DLOG(INFO) << "Could not setup instance proc addresses."; + FML_DLOG(INFO) << "Could not set up instance proc addresses."; return; } @@ -114,7 +114,7 @@ VulkanApplication::VulkanApplication( if (enable_instance_debugging) { auto debug_report = std::make_unique(vk, instance_); if (!debug_report->IsValid()) { - FML_DLOG(INFO) << "Vulkan debugging was enabled but could not be setup " + FML_DLOG(INFO) << "Vulkan debugging was enabled but could not be set up " "for this instance."; } else { debug_report_ = std::move(debug_report); diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc index fbc9aaa13e862..e35d6537e669b 100644 --- a/vulkan/vulkan_device.cc +++ b/vulkan/vulkan_device.cc @@ -107,7 +107,7 @@ VulkanDevice::VulkanDevice(VulkanProcTable& p_vk, [this](VkDevice device) { vk.DestroyDevice(device, nullptr); }}; if (!vk.SetupDeviceProcAddresses(device_)) { - FML_DLOG(INFO) << "Could not setup device proc addresses."; + FML_DLOG(INFO) << "Could not set up device proc addresses."; return; } @@ -326,7 +326,7 @@ bool VulkanDevice::ChoosePresentMode(const VulkanSurface& surface, // mentioned in the ticket w.r.t the application being faster that the refresh // rate of the screen should not be faced by any Flutter platforms as they are // powered by Vsync pulses instead of depending the submit to block. - // However, for platforms that don't have VSync providers setup, it is better + // However, for platforms that don't have VSync providers set up, it is better // to fall back to FIFO. For platforms that do have VSync providers, there // should be little difference. In case there is a need for a mode other than // FIFO, availability checks must be performed here before returning the diff --git a/vulkan/vulkan_window.cc b/vulkan/vulkan_window.cc index 3ca06b3b23e8a..d3bd23c9e5eb6 100644 --- a/vulkan/vulkan_window.cc +++ b/vulkan/vulkan_window.cc @@ -52,9 +52,9 @@ VulkanWindow::VulkanWindow(const sk_sp& context, std::move(extensions)); if (!application_->IsValid() || !vk->AreInstanceProcsSetup()) { - // Make certain the application instance was created and it setup the + // Make certain the application instance was created and it set up the // instance proc table entries. - FML_DLOG(INFO) << "Instance proc addresses have not been setup."; + FML_DLOG(INFO) << "Instance proc addresses have not been set up."; return; } @@ -64,9 +64,9 @@ VulkanWindow::VulkanWindow(const sk_sp& context, if (logical_device_ == nullptr || !logical_device_->IsValid() || !vk->AreDeviceProcsSetup()) { - // Make certain the device was created and it setup the device proc table + // Make certain the device was created and it set up the device proc table // entries. - FML_DLOG(INFO) << "Device proc addresses have not been setup."; + FML_DLOG(INFO) << "Device proc addresses have not been set up."; return; } @@ -95,7 +95,7 @@ VulkanWindow::VulkanWindow(const sk_sp& context, // Create the swapchain. if (!RecreateSwapchain()) { - FML_DLOG(INFO) << "Could not setup the swapchain initially."; + FML_DLOG(INFO) << "Could not set up the swapchain initially."; return; }