Skip to content

Commit 2441c47

Browse files
authored
Correct setup-related typos (flutter#24846)
Corrects uses of setup as a verb to 'set up', leaves noun/noun-phrase forms of setup as 'setup'. Also settles on 'teardown' as opposed to tear-down for consistency across the codebase. A few other minor comment/wording corrections.
1 parent 6527a68 commit 2441c47

File tree

55 files changed

+106
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+106
-104
lines changed

ci/docker/build/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
This directory includes scripts to build the docker container image used for
22
building flutter/engine in our CI system (currently [Cirrus](cirrus-ci.org)).
33

4-
In order to run the scripts, you have to setup `docker` and `gcloud`. Please
5-
refer to internal doc go/installdocker for how to setup `docker` on gLinux.
4+
In order to run the scripts, you have to set up `docker` and `gcloud`. Please
5+
refer to internal doc go/installdocker for how to set up `docker` on gLinux.
66

77
Cirrus will build (and cache) a Docker image based on this `Dockerfile` for
88
Linux tasks using its

examples/glfw/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ In order to **build** and **run** the example you should be able to go into this
2424

2525
## Troubleshooting
2626
There are a few things you might have to tweak in order to get your build working:
27-
* 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.
27+
* 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.
2828
* 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.
2929
* 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.

fml/platform/win/mapping_win.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ FileMapping::FileMapping(const fml::UniqueFD& fd,
8888
MapViewOfFile(mapping_handle_.get(), desired_access, 0, 0, mapping_size));
8989

9090
if (mapping == nullptr) {
91-
FML_DLOG(ERROR) << "Could not setup file mapping. "
91+
FML_DLOG(ERROR) << "Could not set up file mapping. "
9292
<< GetLastErrorMessage();
9393
return;
9494
}

lib/ui/channel_buffers.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class _Channel {
236236
/// Messages for a channel are stored until a listener is provided for that channel,
237237
/// using [setListener]. Only one listener may be configured per channel.
238238
///
239-
/// Typically these buffers are drained once a callback is setup on
239+
/// Typically these buffers are drained once a callback is set up on
240240
/// the [BinaryMessenger] in the Flutter framework. (See [setListener].)
241241
///
242242
/// ## Buffer capacity and overflow
@@ -381,7 +381,7 @@ class ChannelBuffers {
381381
/// Remove and process all stored messages for a given channel.
382382
///
383383
/// This should be called once a channel is prepared to handle messages
384-
/// (i.e. when a message handler is setup in the framework).
384+
/// (i.e. when a message handler is set up in the framework).
385385
///
386386
/// The messages are processed by calling the given `callback`. Each message
387387
/// is processed in its own microtask.

lib/ui/painting/image_decoder_unittests.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TestIOManager final : public IOManager {
4040
weak_factory_(this) {
4141
FML_CHECK(task_runner->RunsTasksOnCurrentThread())
4242
<< "The IO manager must be initialized its primary task runner. The "
43-
"test harness may not be setup correctly/safely.";
43+
"test harness may not be set up correctly/safely.";
4444
weak_prototype_ = weak_factory_.GetWeakPtr();
4545
}
4646

lib/ui/painting/image_encoding.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ sk_sp<SkData> CopyImageByteData(sk_sp<SkImage> raster_image,
172172
color_type, kPremul_SkAlphaType, nullptr));
173173

174174
if (!surface) {
175-
FML_LOG(ERROR) << "Could not setup the surface for swizzle.";
175+
FML_LOG(ERROR) << "Could not set up the surface for swizzle.";
176176
return nullptr;
177177
}
178178

lib/web_ui/dev/integration_tests_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class IntegrationTestsManager {
351351
print('ERROR: Test driver file named has ${expectedDriverName} '
352352
'not found under directory ${testDirectory.path}. Stopping the '
353353
'integration tests. Please add ${expectedDriverName}. Check to '
354-
'README file on more details on how to setup integration tests.');
354+
'README file on more details on how to set up integration tests.');
355355
}
356356
throw StateError('Error in test files. Check the logs for '
357357
'further instructions');

lib/web_ui/lib/src/engine/dom_renderer.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ flt-glass-pane * {
454454
if (html.window.visualViewport == null && isWebKit) {
455455
// Safari sometimes gives us bogus innerWidth/innerHeight values when the
456456
// page loads. When it changes the values to correct ones it does not
457-
// notify of the change via `onResize`. As a workaround, we setup a
457+
// notify of the change via `onResize`. As a workaround, we set up a
458458
// temporary periodic timer that polls innerWidth and triggers the
459459
// resizeListener so that the framework can react to the change.
460460
//
@@ -464,7 +464,7 @@ flt-glass-pane * {
464464
// VisualViewport API is not enabled in Firefox as well. On the other hand
465465
// Firefox returns correct values for innerHeight, innerWidth.
466466
// Firefox also triggers html.window.onResize therefore we don't need this
467-
// timer setup for Firefox.
467+
// timer to be set up for Firefox.
468468
final int initialInnerWidth = html.window.innerWidth!;
469469
// Counts how many times we checked screen size. We check up to 5 times.
470470
int checkCount = 0;

lib/web_ui/lib/src/engine/navigation/history.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@ class SingleEntryBrowserHistory extends BrowserHistory {
217217
if (!_isFlutterEntry(html.window.history.state)) {
218218
// An entry may not have come from Flutter, for example, when the user
219219
// refreshes the page. They land directly on the "flutter" entry, so
220-
// there's no need to setup the "origin" and "flutter" entries, we can
221-
// safely assume they are already setup.
220+
// there's no need to set up the "origin" and "flutter" entries, we can
221+
// safely assume they are already set up.
222222
_setupOriginEntry(strategy);
223223
_setupFlutterEntry(strategy, replace: false, path: path);
224224
}

lib/web_ui/lib/src/engine/text/measurement.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class RulerManager extends RulerHost {
7070

7171
/// The cache of rulers used to measure text.
7272
///
73-
/// Each ruler is keyed by paragraph style. This allows us to setup the
73+
/// Each ruler is keyed by paragraph style. This allows us to set up the
7474
/// ruler's DOM structure once during the very first measurement of a given
7575
/// paragraph style. Subsequent measurements could reuse the same ruler and
7676
/// only swap the text contents. This minimizes the amount of work a browser

0 commit comments

Comments
 (0)