Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 677592a

Browse files
eggflyeggfly
authored
Fix typo and clean some includes (#29940)
1 parent db011bb commit 677592a

File tree

10 files changed

+10
-31
lines changed

10 files changed

+10
-31
lines changed

‎runtime/dart_isolate.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <cstdlib>
88
#include <tuple>
99

10-
#include "flutter/fml/paths.h"
1110
#include "flutter/fml/posix_wrappers.h"
1211
#include "flutter/fml/trace_event.h"
1312
#include "flutter/lib/io/dart_io.h"

‎runtime/dart_isolate_unittests.cc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "flutter/fml/mapping.h"
88
#include "flutter/fml/synchronization/count_down_latch.h"
99
#include "flutter/fml/synchronization/waitable_event.h"
10-
#include "flutter/fml/thread.h"
1110
#include "flutter/runtime/dart_vm.h"
1211
#include "flutter/runtime/dart_vm_lifecycle.h"
1312
#include "flutter/runtime/isolate_configuration.h"
@@ -336,7 +335,7 @@ TEST_F(DartSecondaryIsolateTest, CanLaunchSecondaryIsolates) {
336335
// root isolate will be auto-shutdown
337336
}
338337

339-
TEST_F(DartIsolateTest, CanRecieveArguments) {
338+
TEST_F(DartIsolateTest, CanReceiveArguments) {
340339
AddNativeCallback("NotifyNative",
341340
CREATE_NATIVE_ENTRY(([this](Dart_NativeArguments args) {
342341
ASSERT_TRUE(tonic::DartConverter<bool>::FromDart(
@@ -354,7 +353,7 @@ TEST_F(DartIsolateTest, CanRecieveArguments) {
354353
thread //
355354
);
356355
auto isolate = RunDartCodeInIsolate(vm_ref, settings, task_runners,
357-
"testCanRecieveArguments", {"arg1"},
356+
"testCanReceiveArguments", {"arg1"},
358357
GetDefaultKernelFilePath());
359358
ASSERT_TRUE(isolate);
360359
ASSERT_EQ(isolate->get()->GetPhase(), DartIsolate::Phase::Running);

‎runtime/dart_vm.cc‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,18 @@
66

77
#include <sys/stat.h>
88

9-
#include <mutex>
109
#include <sstream>
1110
#include <vector>
1211

1312
#include "flutter/common/settings.h"
1413
#include "flutter/fml/compiler_specific.h"
15-
#include "flutter/fml/file.h"
1614
#include "flutter/fml/logging.h"
1715
#include "flutter/fml/mapping.h"
1816
#include "flutter/fml/size.h"
19-
#include "flutter/fml/synchronization/count_down_latch.h"
2017
#include "flutter/fml/time/time_delta.h"
2118
#include "flutter/fml/trace_event.h"
22-
#include "flutter/lib/io/dart_io.h"
23-
#include "flutter/lib/ui/dart_runtime_hooks.h"
2419
#include "flutter/lib/ui/dart_ui.h"
2520
#include "flutter/runtime/dart_isolate.h"
26-
#include "flutter/runtime/dart_service_isolate.h"
2721
#include "flutter/runtime/dart_vm_initializer.h"
2822
#include "flutter/runtime/ptrace_check.h"
2923
#include "third_party/dart/runtime/include/bin/dart_io_api.h"
@@ -33,7 +27,6 @@
3327
#include "third_party/tonic/dart_class_provider.h"
3428
#include "third_party/tonic/file_loader/file_loader.h"
3529
#include "third_party/tonic/logging/dart_error.h"
36-
#include "third_party/tonic/scopes/dart_api_scope.h"
3730
#include "third_party/tonic/typed_data/typed_list.h"
3831

3932
namespace dart {

‎runtime/fixtures/runtime_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void testCanLaunchSecondaryIsolate() {
6565
}
6666

6767
@pragma('vm:entry-point')
68-
void testCanRecieveArguments(List<String> args) {
68+
void testCanReceiveArguments(List<String> args) {
6969
notifyResult(args.length == 1 && args[0] == 'arg1');
7070
}
7171

‎shell/common/engine.cc‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,15 @@
1111
#include <vector>
1212

1313
#include "flutter/common/settings.h"
14-
#include "flutter/fml/eintr_wrapper.h"
15-
#include "flutter/fml/file.h"
1614
#include "flutter/fml/make_copyable.h"
17-
#include "flutter/fml/paths.h"
1815
#include "flutter/fml/trace_event.h"
19-
#include "flutter/fml/unique_fd.h"
2016
#include "flutter/lib/snapshot/snapshot.h"
2117
#include "flutter/lib/ui/text/font_collection.h"
2218
#include "flutter/shell/common/animator.h"
2319
#include "flutter/shell/common/platform_view.h"
2420
#include "flutter/shell/common/shell.h"
2521
#include "rapidjson/document.h"
2622
#include "third_party/dart/runtime/include/dart_tools_api.h"
27-
#include "third_party/skia/include/core/SkCanvas.h"
28-
#include "third_party/skia/include/core/SkPictureRecorder.h"
2923

3024
namespace flutter {
3125

‎shell/common/fixtures/shell_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ void notifyNativeWhenEngineRun(bool success) native 'NotifyNativeWhenEngineRun';
253253
void notifyNativeWhenEngineSpawn(bool success) native 'NotifyNativeWhenEngineSpawn';
254254

255255
@pragma('vm:entry-point')
256-
void canRecieveArgumentsWhenEngineRun(List<String> args) {
256+
void canReceiveArgumentsWhenEngineRun(List<String> args) {
257257
notifyNativeWhenEngineRun(args.length == 2 && args[0] == 'foo' && args[1] == 'bar');
258258
}
259259

260260
@pragma('vm:entry-point')
261-
void canRecieveArgumentsWhenEngineSpawn(List<String> args) {
261+
void canReceiveArgumentsWhenEngineSpawn(List<String> args) {
262262
notifyNativeWhenEngineSpawn(args.length == 2 && args[0] == 'arg1' && args[1] == 'arg2');
263263
}

‎shell/common/shell.cc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "flutter/fml/message_loop.h"
2121
#include "flutter/fml/paths.h"
2222
#include "flutter/fml/trace_event.h"
23-
#include "flutter/fml/unique_fd.h"
2423
#include "flutter/runtime/dart_vm.h"
2524
#include "flutter/shell/common/engine.h"
2625
#include "flutter/shell/common/skia_event_tracer_impl.h"

‎shell/common/shell_io_manager.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
#include "flutter/shell/common/shell_io_manager.h"
66

7-
#include "flutter/common/graphics/persistent_cache.h"
8-
#include "flutter/fml/build_config.h"
97
#include "flutter/fml/message_loop.h"
108
#include "flutter/shell/common/context_options.h"
119
#include "third_party/skia/include/gpu/gl/GrGLInterface.h"

‎shell/common/shell_unittests.cc‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66

77
#include <algorithm>
88
#include <ctime>
9-
#include <functional>
109
#include <future>
1110
#include <memory>
1211
#include <vector>
1312

1413
#include "assets/directory_asset_bundle.h"
1514
#include "common/graphics/persistent_cache.h"
16-
#include "flutter/common/graphics/persistent_cache.h"
17-
#include "flutter/flow/layers/layer_tree.h"
1815
#include "flutter/flow/layers/picture_layer.h"
1916
#include "flutter/flow/layers/transform_layer.h"
2017
#include "flutter/fml/command_line.h"
@@ -2863,13 +2860,13 @@ TEST_F(ShellTest, SpawnWithDartEntrypointArgs) {
28632860

28642861
auto configuration = RunConfiguration::InferFromSettings(settings);
28652862
ASSERT_TRUE(configuration.IsValid());
2866-
configuration.SetEntrypoint("canRecieveArgumentsWhenEngineRun");
2863+
configuration.SetEntrypoint("canReceiveArgumentsWhenEngineRun");
28672864
const std::vector<std::string> entrypoint_args{"foo", "bar"};
28682865
configuration.SetEntrypointArgs(entrypoint_args);
28692866

28702867
auto second_configuration = RunConfiguration::InferFromSettings(settings);
28712868
ASSERT_TRUE(second_configuration.IsValid());
2872-
second_configuration.SetEntrypoint("canRecieveArgumentsWhenEngineSpawn");
2869+
second_configuration.SetEntrypoint("canReceiveArgumentsWhenEngineSpawn");
28732870
const std::vector<std::string> second_entrypoint_args{"arg1", "arg2"};
28742871
second_configuration.SetEntrypointArgs(second_entrypoint_args);
28752872

@@ -2902,7 +2899,7 @@ TEST_F(ShellTest, SpawnWithDartEntrypointArgs) {
29022899
main_latch.Wait();
29032900
ASSERT_TRUE(DartVMRef::IsInstanceRunning());
29042901
// Check first Shell ran the first entrypoint.
2905-
ASSERT_EQ("canRecieveArgumentsWhenEngineRun", last_entry_point);
2902+
ASSERT_EQ("canReceiveArgumentsWhenEngineRun", last_entry_point);
29062903

29072904
PostSync(
29082905
shell->GetTaskRunners().GetPlatformTaskRunner(),
@@ -2926,7 +2923,7 @@ TEST_F(ShellTest, SpawnWithDartEntrypointArgs) {
29262923
PostSync(spawner->GetTaskRunners().GetUITaskRunner(),
29272924
[&spawn, &spawner, initial_route] {
29282925
// Check second shell ran the second entrypoint.
2929-
ASSERT_EQ("canRecieveArgumentsWhenEngineSpawn",
2926+
ASSERT_EQ("canReceiveArgumentsWhenEngineSpawn",
29302927
spawn->GetEngine()->GetLastEntrypoint());
29312928
ASSERT_EQ(initial_route, spawn->GetEngine()->InitialRoute());
29322929

‎shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private void setSystemChromeEnabledSystemUIMode(PlatformChannel.SystemUiMode sys
245245
// LEAN BACK
246246
// Available starting at SDK 16
247247
// Should not show overlays, tap to reveal overlays, needs onChange callback
248-
// When the overlays come in on tap, the app does not recieve the gesture and does not know
248+
// When the overlays come in on tap, the app does not receive the gesture and does not know
249249
// the system overlay has changed. The overlays cannot be dismissed, so adding the callback
250250
// support will allow users to restore the system ui and dismiss the overlays.
251251
// Not compatible with top/bottom overlays enabled.

0 commit comments

Comments
 (0)