From 236385825fb54ca5a93441df4010dd65c6208869 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 10:14:15 -0700 Subject: [PATCH 01/19] change --- runtime/dart_vm.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 23e59cf93b0f2..12dd2c394f4be 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,6 +54,7 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", + "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on From 1291b0167b15bb77be2edbf6bfb56b2b286224a3 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 11:38:28 -0700 Subject: [PATCH 02/19] sound-null-safety --- build/dart/rules.gni | 5 ++++- tools/fuchsia/dart/kernel/dart_kernel.gni | 8 +------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/build/dart/rules.gni b/build/dart/rules.gni index ec70bac7bc125..e91012b3e3ada 100644 --- a/build/dart/rules.gni +++ b/build/dart/rules.gni @@ -58,7 +58,10 @@ template("flutter_frontend_server") { snapshot_depfile = "$kernel_output.d" - common_vm_args = [ "--disable-dart-dev" ] + common_vm_args = [ + "--disable-dart-dev", + "--sound_null_safety", + ] flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk", root_build_dir) diff --git a/tools/fuchsia/dart/kernel/dart_kernel.gni b/tools/fuchsia/dart/kernel/dart_kernel.gni index aa7c908cc50f6..6053eb5f1e504 100644 --- a/tools/fuchsia/dart/kernel/dart_kernel.gni +++ b/tools/fuchsia/dart/kernel/dart_kernel.gni @@ -135,9 +135,6 @@ template("_convert_kernel_manifest") { # Whether the kernel compiler should link the current platform.dill into # the build. If false, the --no-link-platform flag will be passed to the # compiler. Defaults to false. -# -# sound_null_safety (optional) -# Whether to generate sound null safe kernel. template("dart_kernel") { assert(defined(invoker.platform_name), "dart_kernel() requires platform_name") assert(defined(invoker.packages_path), @@ -278,12 +275,9 @@ template("dart_kernel") { rebase_path(depfile, root_build_dir), "--output", rebase_path(_kernel_path, root_build_dir), + "--sound-null-safety", ] - if (!defined(invoker.sound_null_safety) || !invoker.sound_null_safety) { - args += [ "--no-sound-null-safety" ] - } - # TODO(richkadel): It should be possible to remove all of the build rules # related to `generate_manifest`. Without the following two flags, the # `gen_kernel` step will produce one large `.dil` file, instead of multiple From d1597c237236d90395f71786c80064accaf903ea Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 11:40:26 -0700 Subject: [PATCH 03/19] remove --- build/dart/rules.gni | 5 +---- runtime/dart_vm.cc | 1 - .../tests/integration/text-input/text-input-view/BUILD.gn | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/build/dart/rules.gni b/build/dart/rules.gni index e91012b3e3ada..ec70bac7bc125 100644 --- a/build/dart/rules.gni +++ b/build/dart/rules.gni @@ -58,10 +58,7 @@ template("flutter_frontend_server") { snapshot_depfile = "$kernel_output.d" - common_vm_args = [ - "--disable-dart-dev", - "--sound_null_safety", - ] + common_vm_args = [ "--disable-dart-dev" ] flutter_patched_sdk = rebase_path("$root_out_dir/flutter_patched_sdk", root_build_dir) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 12dd2c394f4be..23e59cf93b0f2 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,7 +54,6 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", - "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn index 38d8760bdbd9a..c0d7f92342c2f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn @@ -22,7 +22,6 @@ flutter_component("component") { manifest = rebase_path("meta/text-input-view.cml") main_package = "text-input-view" main_dart = "text_input_view.dart" - sound_null_safety = true deps = [ ":lib" ] } From 634df98d7380356a3aa7e9a50c49d8aac7c5b672 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 12:48:18 -0700 Subject: [PATCH 04/19] null --- .../mouse-input/mouse-input-view/lib/mouse-input-view.dart | 6 +++--- .../embedding-flutter-view/lib/embedding-flutter-view.dart | 2 +- .../touch-input/touch-input-view/lib/touch-input-view.dart | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart index 9e990890ee6af..d62b1864aa700 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart @@ -100,13 +100,13 @@ class MyApp { } void _reportMouseInput( - {double localX, + double localX, double localY, int timeReceived, int buttons, String phase, double wheelXPhysicalPixel, - double wheelYPhysicalPixel}) { + double wheelYPhysicalPixel) { print('mouse-input-view reporting mouse input to MouseInputListener'); final message = ByteData.sublistView(utf8.encode(json.encode({ 'method': 'MouseInputListener.ReportMouseInput', @@ -115,7 +115,7 @@ class MyApp { 'time_received': timeReceived, 'component_name': 'touch-input-view', 'buttons': buttons, - 'phase': 'asdf', + 'phase': phase, 'wheel_x_physical_pixel': wheelXPhysicalPixel, 'wheel_y_physical_pixel': wheelYPhysicalPixel, }))); diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart index 4f3613427818b..2a902bc196811 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart @@ -161,7 +161,7 @@ class TestApp { window.scheduleFrame(); } - void _reportTouchInput({double localX, double localY, int timeReceived}) { + void _reportTouchInput(double localX, double localY, int timeReceived) { print('embedding-flutter-view reporting touch input to TouchInputListener'); final message = utf8.encode(json.encode({ 'method': 'TouchInputListener.ReportTouchInput', diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart index b8cb1c98c985a..63d4d1838a9dd 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart @@ -80,7 +80,7 @@ class TestApp { window.scheduleFrame(); } - void _reportTouchInput({double localX, double localY, int timeReceived}) { + void _reportTouchInput(double localX, double localY, int timeReceived) { print('touch-input-view reporting touch input to TouchInputListener'); final message = utf8.encode(json.encode({ 'method': 'TouchInputListener.ReportTouchInput', From 7c1b9363be0e3c6ee7b16ae3e3cc7c7b763d0a68 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 13:13:56 -0700 Subject: [PATCH 05/19] null_safe --- .../tests/integration/embedder/child-view/BUILD.gn | 1 + .../integration/embedder/parent-view/BUILD.gn | 1 + .../mouse-input/mouse-input-view/BUILD.gn | 1 + .../mouse-input-view/lib/mouse-input-view.dart | 14 +++++++------- .../touch-input/embedding-flutter-view/BUILD.gn | 1 + .../lib/embedding-flutter-view.dart | 6 +++--- .../touch-input/touch-input-view/BUILD.gn | 1 + .../touch-input-view/lib/touch-input-view.dart | 6 +++--- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn index 22534d2566a09..d716a6161bf89 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn @@ -10,6 +10,7 @@ import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { package_name = "child-view" sources = [ "child_view.dart" ] + null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn index 1e0def98cbd1f..e211670d6e60b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn @@ -10,6 +10,7 @@ import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { package_name = "parent-view" sources = [ "parent_view.dart" ] + null_safe = true deps = [ "//flutter/shell/platform/fuchsia/dart:args", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn index 0126dc2353607..7dd17e054c087 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn @@ -13,6 +13,7 @@ dart_library("lib") { sources = [ "mouse-input-view.dart" ] deps = [ "//flutter/shell/platform/fuchsia/dart:args" ] + null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart index d62b1864aa700..8a1ced9ad96f5 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart @@ -85,13 +85,13 @@ class MyApp { } _reportMouseInput( - localX: data.physicalX, - localY: data.physicalY, - buttons: data.buttons, - phase: data.change.name, - timeReceived: nowNanos, - wheelXPhysicalPixel: data.scrollDeltaX, - wheelYPhysicalPixel: data.scrollDeltaY, + data.physicalX, + data.physicalY, + nowNanos, + data.buttons, + data.change.name, + data.scrollDeltaX, + data.scrollDeltaY, ); } } diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn index 6e86329531f9a..f837be5cba7a9 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn @@ -16,6 +16,7 @@ dart_library("lib") { "//flutter/shell/platform/fuchsia/dart:args", "//flutter/shell/platform/fuchsia/dart:vector_math", ] + null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart index 2a902bc196811..9ad04117e115d 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart @@ -151,9 +151,9 @@ class TestApp { if (data.change == PointerChange.down || data.change == PointerChange.move) { _reportTouchInput( - localX: data.physicalX, - localY: data.physicalY, - timeReceived: nowNanos, + data.physicalX, + data.physicalY, + nowNanos, ); } } diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn index 9ef6301ece171..1877839812662 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn @@ -13,6 +13,7 @@ dart_library("lib") { sources = [ "touch-input-view.dart" ] deps = [ "//flutter/shell/platform/fuchsia/dart:args" ] + null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart index 63d4d1838a9dd..d97e090e5a81b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart @@ -70,9 +70,9 @@ class TestApp { if (data.change == PointerChange.down || data.change == PointerChange.move) { _reportTouchInput( - localX: data.physicalX, - localY: data.physicalY, - timeReceived: nowNanos, + data.physicalX, + data.physicalY, + nowNanos, ); } } From ea802557b53ed34a22b2bcbdf40acf160fa6c4c5 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 13:15:41 -0700 Subject: [PATCH 06/19] ? --- .../integration/embedder/parent-view/lib/parent_view.dart | 4 ++-- .../embedding-flutter-view/lib/embedding-flutter-view.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart index 8cb272e34d91b..e1f8f6b2372ab 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart @@ -50,7 +50,7 @@ class TestApp { this.focusable = true}) {} void run() { - childView.create(focusable, (ByteData reply) { + childView.create(focusable, (ByteData? reply) { // Set up window allbacks. window.onPointerDataPacket = (PointerDataPacket packet) { for (final data in packet.data) { @@ -181,7 +181,7 @@ Future _launchChildView() async { final message = Int8List.fromList([0x31]); final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( - 'fuchsia/child_view', ByteData.sublistView(message), (ByteData reply) { + 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { completer.complete(reply); }); diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart index 9ad04117e115d..98b6d5b95a628 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart @@ -53,7 +53,7 @@ class TestApp { } void run() { - childView.create(focusable, (ByteData reply) { + childView.create(focusable, (ByteData? reply) { // Set up window callbacks. window.onPointerDataPacket = (PointerDataPacket packet) { this.pointerDataPacket(packet); @@ -219,7 +219,7 @@ Future _launchChildView() async { final message = Int8List.fromList([0x31]); final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( - 'fuchsia/child_view', ByteData.sublistView(message), (ByteData reply) { + 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { completer.complete(reply); }); From f566690ea39fb72b771c6197ca56a02d6d8d78d7 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 13:22:59 -0700 Subject: [PATCH 07/19] remove null_safe --- .../startup_integration_test/dart_echo_server/BUILD.gn | 3 --- .../tests/integration/embedder/child-view/BUILD.gn | 1 - .../tests/integration/embedder/parent-view/BUILD.gn | 1 - .../integration/mouse-input/mouse-input-view/BUILD.gn | 1 - .../tests/integration/text-input/text-input-view/BUILD.gn | 1 - .../touch-input/embedding-flutter-view/BUILD.gn | 1 - .../integration/touch-input/touch-input-view/BUILD.gn | 1 - tools/fuchsia/dart/dart_component.gni | 4 ---- tools/fuchsia/dart/dart_library.gni | 8 +++----- tools/fuchsia/flutter/flutter_component.gni | 3 --- tools/fuchsia/flutter/internal/flutter_dart_component.gni | 4 ---- tools/fuchsia/sdk/sdk_targets.gni | 6 +----- 12 files changed, 4 insertions(+), 30 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn index 100b1d04ff724..87db0a6fcb46f 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_echo_server/BUILD.gn @@ -11,7 +11,6 @@ import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { testonly = true package_name = "dart_echo_server" - null_safe = true source_dir = "." sources = [ "main.dart" ] @@ -20,7 +19,6 @@ dart_library("lib") { # Dart component that serves the test Echo FIDL protocol, built using the Dart AOT runner dart_component("aot_component") { testonly = true - null_safe = true main_package = "dart_echo_server" manifest = "meta/dart-aot-echo-server.cml" @@ -32,7 +30,6 @@ dart_component("aot_component") { # Dart component that serves the test Echo FIDL protocol, built using the Dart AOT runner dart_component("jit_component") { testonly = true - null_safe = true main_package = "dart_echo_server" manifest = "meta/dart-jit-echo-server.cml" diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn index d716a6161bf89..22534d2566a09 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/child-view/BUILD.gn @@ -10,7 +10,6 @@ import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { package_name = "child-view" sources = [ "child_view.dart" ] - null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn index e211670d6e60b..1e0def98cbd1f 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/BUILD.gn @@ -10,7 +10,6 @@ import("//flutter/tools/fuchsia/gn-sdk/src/package.gni") dart_library("lib") { package_name = "parent-view" sources = [ "parent_view.dart" ] - null_safe = true deps = [ "//flutter/shell/platform/fuchsia/dart:args", diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn index 7dd17e054c087..0126dc2353607 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/BUILD.gn @@ -13,7 +13,6 @@ dart_library("lib") { sources = [ "mouse-input-view.dart" ] deps = [ "//flutter/shell/platform/fuchsia/dart:args" ] - null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn index c0d7f92342c2f..c2c289ce22a73 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/text-input-view/BUILD.gn @@ -13,7 +13,6 @@ dart_library("lib") { package_name = "text-input-view" sources = [ "text_input_view.dart" ] deps = [ "//flutter/shell/platform/fuchsia/dart:args" ] - null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn index f837be5cba7a9..6e86329531f9a 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/BUILD.gn @@ -16,7 +16,6 @@ dart_library("lib") { "//flutter/shell/platform/fuchsia/dart:args", "//flutter/shell/platform/fuchsia/dart:vector_math", ] - null_safe = true } flutter_component("component") { diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn index 1877839812662..9ef6301ece171 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/BUILD.gn @@ -13,7 +13,6 @@ dart_library("lib") { sources = [ "touch-input-view.dart" ] deps = [ "//flutter/shell/platform/fuchsia/dart:args" ] - null_safe = true } flutter_component("component") { diff --git a/tools/fuchsia/dart/dart_component.gni b/tools/fuchsia/dart/dart_component.gni index 7e76ebf80e349..8cf19ba8a3f87 100644 --- a/tools/fuchsia/dart/dart_component.gni +++ b/tools/fuchsia/dart/dart_component.gni @@ -81,9 +81,6 @@ import("//flutter/tools/fuchsia/flutter/internal/flutter_dart_component.gni") # Specifies the parameters for building the component. # See //build/dart/dart_build_config.gni for predefined configs. # -# null_safe (optional) -# If true, this component will be compiled with --sound-null-safety -# # deps # testonly # visibility @@ -123,7 +120,6 @@ template("dart_component") { "build_cfg", "deps", "main_dart", - "null_safe", ]) main_package = _main_package deps = _component_deps diff --git a/tools/fuchsia/dart/dart_library.gni b/tools/fuchsia/dart/dart_library.gni index 5eea0fe04e991..1876da392b2e6 100644 --- a/tools/fuchsia/dart/dart_library.gni +++ b/tools/fuchsia/dart/dart_library.gni @@ -76,9 +76,6 @@ import("//flutter/tools/fuchsia/dart/toolchain.gni") # disable_metadata_entry (optional) # Prevents metedata entry from being written to the dart_packag_config json file. # -# null_safe (optional) -# A flag that enables null safety check in dart libraries. -# # Example of usage: # # dart_library("baz") { @@ -183,9 +180,10 @@ if (current_toolchain == dart_toolchain) { name = package_name if (defined(invoker.language_version)) { language_version = invoker.language_version - } else if (defined(invoker.null_safe) && invoker.null_safe) { + } else { language_version = "2.12" - } else if (defined(invoker.pubspec)) { + } + if (defined(invoker.pubspec)) { pubspec_path = rebase_path(invoker.pubspec, root_build_dir) } root_uri = rebase_path(package_root, root_build_dir) diff --git a/tools/fuchsia/flutter/flutter_component.gni b/tools/fuchsia/flutter/flutter_component.gni index 3932ddf354852..8fd99842cbba0 100644 --- a/tools/fuchsia/flutter/flutter_component.gni +++ b/tools/fuchsia/flutter/flutter_component.gni @@ -84,9 +84,6 @@ import("//flutter/tools/fuchsia/flutter/internal/flutter_dart_component.gni") # Specifies the parameters for building the component. # See //flutter/tools/fuchsia/flutter/flutter_build_config.gni for predefined configs. # -# sound_null_safety (optional) -# Whether to generate sound null safe Dart kernel. -# # deps # testonly # visibility diff --git a/tools/fuchsia/flutter/internal/flutter_dart_component.gni b/tools/fuchsia/flutter/internal/flutter_dart_component.gni index d43d6f753fbc8..72cd952b8418b 100644 --- a/tools/fuchsia/flutter/internal/flutter_dart_component.gni +++ b/tools/fuchsia/flutter/internal/flutter_dart_component.gni @@ -48,9 +48,6 @@ import("//flutter/tools/fuchsia/gn-sdk/src/component.gni") # Type: boolean # Default: false # -# sound_null_safety (optional) -# If true, generate sound null safe Dart kernel. -# # deps # testonly # visibility @@ -147,7 +144,6 @@ template("flutter_dart_component") { "visibility", "main_dart", "main_package", - "sound_null_safety", ]) deps = [ ":$_dart_package_config_target_name" ] diff --git a/tools/fuchsia/sdk/sdk_targets.gni b/tools/fuchsia/sdk/sdk_targets.gni index 159ce98c2ce36..f0b5c8a6490e8 100644 --- a/tools/fuchsia/sdk/sdk_targets.gni +++ b/tools/fuchsia/sdk/sdk_targets.gni @@ -17,11 +17,7 @@ template("_fuchsia_dart_library") { _sources = [] _deps = [] - if (defined(meta.dart_library_null_safe) && meta.dart_library_null_safe) { - _dart_language_version = "2.12" - } else { - _dart_language_version = "2.0" - } + _dart_language_version = "2.12" foreach(source, meta.sources) { _sources += [ string_replace("$source", "${meta.root}/lib/", "") ] From 36451ceca995d37a51895c7d4f3e7575e1380cee Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 13:28:02 -0700 Subject: [PATCH 08/19] blabla --- tools/fuchsia/dart/dart_library.gni | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/fuchsia/dart/dart_library.gni b/tools/fuchsia/dart/dart_library.gni index 1876da392b2e6..ed3ded2cc930f 100644 --- a/tools/fuchsia/dart/dart_library.gni +++ b/tools/fuchsia/dart/dart_library.gni @@ -180,12 +180,11 @@ if (current_toolchain == dart_toolchain) { name = package_name if (defined(invoker.language_version)) { language_version = invoker.language_version + } else if (defined(invoker.pubspec)) { + pubspec_path = rebase_path(invoker.pubspec, root_build_dir) } else { language_version = "2.12" } - if (defined(invoker.pubspec)) { - pubspec_path = rebase_path(invoker.pubspec, root_build_dir) - } root_uri = rebase_path(package_root, root_build_dir) if (defined(invoker.source_dir)) { package_uri = invoker.source_dir From 148bf3fc2016939c28fb50d96ee801208ea799bb Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 15:45:49 -0700 Subject: [PATCH 09/19] always null_safety --- .../platform/fuchsia/dart_runner/service_isolate.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/service_isolate.cc b/shell/platform/fuchsia/dart_runner/service_isolate.cc index c9af7409a8398..59d9cb8fbf999 100644 --- a/shell/platform/fuchsia/dart_runner/service_isolate.cc +++ b/shell/platform/fuchsia/dart_runner/service_isolate.cc @@ -122,19 +122,9 @@ Dart_Isolate CreateServiceIsolate( } #endif - bool is_null_safe = - Dart_DetectNullSafety(nullptr, // script_uri - nullptr, // package_config - nullptr, // original_working_directory - vmservice_data, // snapshot_data - vmservice_instructions, // snapshot_instructions - nullptr, // kernel_buffer - 0u // kernel_buffer_size - ); - Dart_IsolateFlags flags; Dart_IsolateFlagsInitialize(&flags); - flags.null_safety = is_null_safe; + flags.null_safety = true; auto state = new std::shared_ptr(new tonic::DartState()); Dart_Isolate isolate = Dart_CreateIsolateGroup( From bfa7abd42c625fb540484beca39a3d4e8d24b51e Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 18:04:42 -0700 Subject: [PATCH 10/19] vm --- runtime/dart_vm.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 23e59cf93b0f2..12dd2c394f4be 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,6 +54,7 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", + "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on From 95f545ca1b5b166f43d24f0d26efc59b9802c6b0 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 18:37:52 -0700 Subject: [PATCH 11/19] undo --- runtime/dart_vm.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 12dd2c394f4be..23e59cf93b0f2 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,7 +54,6 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", - "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on From fffc72c7e6029878827805b383bdfc9b528122b5 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 18:49:31 -0700 Subject: [PATCH 12/19] force true --- .../dart_runner/dart_component_controller.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc index c86ff1208cd85..12dc5df409c9a 100644 --- a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc @@ -310,8 +310,6 @@ bool DartComponentController::SetUpFromKernel() { manifest.size()); Dart_Handle library = Dart_Null(); - bool first_library = true; - bool result_sound_null_safety = false; for (size_t start = 0; start < manifest.size();) { size_t end = str.find("\n", start); if (end == std::string::npos) { @@ -330,27 +328,12 @@ bool DartComponentController::SetUpFromKernel() { Dart_ExitScope(); return false; } - bool sound_null_safety = Dart_DetectNullSafety( - /*script_uri=*/nullptr, /*package_config=*/nullptr, - /*original_working_directory=*/nullptr, - isolate_snapshot_data_.address(), - /*isolate_snapshot_instructions=*/nullptr, kernel.address(), - kernel.size()); - - if (first_library) { - result_sound_null_safety = sound_null_safety; - first_library = false; - } else if (sound_null_safety != result_sound_null_safety) { - FML_LOG(ERROR) << "Inconsistent sound null safety"; - return false; - } - kernel_peices_.emplace_back(std::move(kernel)); } Dart_IsolateFlags isolate_flags; Dart_IsolateFlagsInitialize(&isolate_flags); - isolate_flags.null_safety = result_sound_null_safety; + isolate_flags.null_safety = true; if (!CreateIsolate(isolate_snapshot_data_.address(), /*isolate_snapshot_instructions=*/nullptr, From 3cd58c049a737162b7b52c052938e8824bdbdedb Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 18:55:09 -0700 Subject: [PATCH 13/19] remove --- .../dart_test_component_controller.cc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc index d7c6b311820fe..8d186060e6515 100644 --- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc @@ -242,8 +242,6 @@ bool DartTestComponentController::SetUpFromKernel() { manifest.size()); Dart_Handle library = Dart_Null(); - bool first_library = true; - bool result_sound_null_safety = false; for (size_t start = 0; start < manifest.size();) { size_t end = str.find("\n", start); if (end == std::string::npos) { @@ -260,27 +258,12 @@ bool DartTestComponentController::SetUpFromKernel() { FML_LOG(ERROR) << "Cannot load kernel from namespace: " << path; return false; } - bool sound_null_safety = Dart_DetectNullSafety( - /*script_uri=*/nullptr, /*package_config=*/nullptr, - /*original_working_directory=*/nullptr, - isolate_snapshot_data_.address(), - /*isolate_snapshot_instructions=*/nullptr, kernel.address(), - kernel.size()); - - if (first_library) { - result_sound_null_safety = sound_null_safety; - first_library = false; - } else if (sound_null_safety != result_sound_null_safety) { - FML_LOG(ERROR) << "Inconsistent sound null safety"; - return false; - } - kernel_peices_.emplace_back(std::move(kernel)); } Dart_IsolateFlags isolate_flags; Dart_IsolateFlagsInitialize(&isolate_flags); - isolate_flags.null_safety = result_sound_null_safety; + isolate_flags.null_safety = true; if (!CreateIsolate(isolate_snapshot_data_.address(), /*isolate_snapshot_instructions=*/nullptr, From 9648892ae4b8179eec2357ead292e239fbb06ac4 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 18:57:54 -0700 Subject: [PATCH 14/19] dart_vm --- runtime/dart_vm.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 23e59cf93b0f2..12dd2c394f4be 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,6 +54,7 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", + "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on From 17e09b01bcd8aae362f17f723593ece03f20783f Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 19:00:01 -0700 Subject: [PATCH 15/19] vm --- runtime/dart_vm.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/runtime/dart_vm.cc b/runtime/dart_vm.cc index 12dd2c394f4be..23e59cf93b0f2 100644 --- a/runtime/dart_vm.cc +++ b/runtime/dart_vm.cc @@ -54,7 +54,6 @@ static const char* kDartAllConfigsArgs[] = { // clang-format off "--enable_mirrors=false", "--background_compilation", - "--sound_null_safety", // 'mark_when_idle' appears to cause a regression, turning off for now. // "--mark_when_idle", // clang-format on From 32107582d9bcd42d4be058b715e63b7a7fa445a4 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 19:05:01 -0700 Subject: [PATCH 16/19] isolate_flags --- .../dart_runner/dart_component_controller.cc | 19 ++++++++----------- .../dart_test_component_controller.cc | 19 ++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc index 12dc5df409c9a..666a29cba63a8 100644 --- a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc @@ -331,13 +331,8 @@ bool DartComponentController::SetUpFromKernel() { kernel_peices_.emplace_back(std::move(kernel)); } - Dart_IsolateFlags isolate_flags; - Dart_IsolateFlagsInitialize(&isolate_flags); - isolate_flags.null_safety = true; - if (!CreateIsolate(isolate_snapshot_data_.address(), - /*isolate_snapshot_instructions=*/nullptr, - &isolate_flags)) { + /*isolate_snapshot_instructions=*/nullptr)) { return false; } @@ -387,15 +382,13 @@ bool DartComponentController::SetUpFromAppSnapshot() { isolate_data = isolate_snapshot_data_.address(); isolate_instructions = nullptr; } - return CreateIsolate(isolate_data, isolate_instructions, - /*isolate_flags=*/nullptr); + return CreateIsolate(isolate_data, isolate_instructions); #endif // defined(AOT_RUNTIME) } bool DartComponentController::CreateIsolate( const uint8_t* isolate_snapshot_data, - const uint8_t* isolate_snapshot_instructions, - Dart_IsolateFlags* isolate_flags) { + const uint8_t* isolate_snapshot_instructions) { // Create the isolate from the snapshot. char* error = nullptr; @@ -406,9 +399,13 @@ bool DartComponentController::CreateIsolate( auto state = new std::shared_ptr(new tonic::DartState( namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); })); + Dart_IsolateFlags isolate_flags; + Dart_IsolateFlagsInitialize(&isolate_flags); + isolate_flags.null_safety = true; + isolate_ = Dart_CreateIsolateGroup( url_.c_str(), label_.c_str(), isolate_snapshot_data, - isolate_snapshot_instructions, isolate_flags, state, state, &error); + isolate_snapshot_instructions, &isolate_flags, state, state, &error); if (!isolate_) { FML_LOG(ERROR) << "Dart_CreateIsolateGroup failed: " << error; return false; diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc index 8d186060e6515..d9d4b07120e2d 100644 --- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc @@ -261,13 +261,8 @@ bool DartTestComponentController::SetUpFromKernel() { kernel_peices_.emplace_back(std::move(kernel)); } - Dart_IsolateFlags isolate_flags; - Dart_IsolateFlagsInitialize(&isolate_flags); - isolate_flags.null_safety = true; - if (!CreateIsolate(isolate_snapshot_data_.address(), - /*isolate_snapshot_instructions=*/nullptr, - &isolate_flags)) { + /*isolate_snapshot_instructions=*/nullptr)) { return false; } @@ -316,15 +311,13 @@ bool DartTestComponentController::SetUpFromAppSnapshot() { isolate_data = isolate_snapshot_data_.address(); isolate_instructions = nullptr; } - return CreateIsolate(isolate_data, isolate_instructions, - /*isolate_flags=*/nullptr); + return CreateIsolate(isolate_data, isolate_instructions); #endif // defined(AOT_RUNTIME) } bool DartTestComponentController::CreateIsolate( const uint8_t* isolate_snapshot_data, - const uint8_t* isolate_snapshot_instructions, - Dart_IsolateFlags* isolate_flags) { + const uint8_t* isolate_snapshot_instructions) { // Create the isolate from the snapshot. char* error = nullptr; @@ -335,9 +328,13 @@ bool DartTestComponentController::CreateIsolate( auto state = new std::shared_ptr(new tonic::DartState( namespace_fd, [this](Dart_Handle result) { MessageEpilogue(result); })); + Dart_IsolateFlags isolate_flags; + Dart_IsolateFlagsInitialize(&isolate_flags); + isolate_flags.null_safety = true; + isolate_ = Dart_CreateIsolateGroup( url_.c_str(), label_.c_str(), isolate_snapshot_data, - isolate_snapshot_instructions, isolate_flags, state, state, &error); + isolate_snapshot_instructions, &isolate_flags, state, state, &error); if (!isolate_) { FML_LOG(ERROR) << "Dart_CreateIsolateGroup failed: " << error; return false; From 4118fdd979e23b2f29baedc2d7d0a7cb8273d077 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Tue, 12 Mar 2024 19:06:18 -0700 Subject: [PATCH 17/19] missing --- shell/platform/fuchsia/dart_runner/dart_component_controller.h | 3 +-- .../fuchsia/dart_runner/dart_test_component_controller.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.h b/shell/platform/fuchsia/dart_runner/dart_component_controller.h index e8c3701a22458..fdc244079217a 100644 --- a/shell/platform/fuchsia/dart_runner/dart_component_controller.h +++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.h @@ -61,8 +61,7 @@ class DartComponentController bool SetUpFromAppSnapshot(); bool CreateIsolate(const uint8_t* isolate_snapshot_data, - const uint8_t* isolate_snapshot_instructions, - Dart_IsolateFlags* isolate_flags); + const uint8_t* isolate_snapshot_instructions); // |Echo| void EchoString(fidl::StringPtr value, EchoStringCallback callback) override; diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h index 3bf9437f2ef52..81655653342d4 100644 --- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h +++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h @@ -77,8 +77,7 @@ class DartTestComponentController bool SetUpFromAppSnapshot(); bool CreateIsolate(const uint8_t* isolate_snapshot_data, - const uint8_t* isolate_snapshot_instructions, - Dart_IsolateFlags* isolate_flags); + const uint8_t* isolate_snapshot_instructions); // |ComponentController| void Kill() override; From 56401e951bac2a21c5bddfea6ec775d13b6437d6 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 13 Mar 2024 10:00:09 -0700 Subject: [PATCH 18/19] address review comments --- .../embedder/parent-view/lib/parent_view.dart | 2 +- .../mouse-input-view/lib/mouse-input-view.dart | 14 +++++++------- .../lib/embedding-flutter-view.dart | 8 ++++---- .../touch-input-view/lib/touch-input-view.dart | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart index e1f8f6b2372ab..34125102b9df1 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart @@ -179,7 +179,7 @@ class ChildView { Future _launchChildView() async { final message = Int8List.fromList([0x31]); - final completer = new Completer(); + final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { completer.complete(reply); diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart index 8a1ced9ad96f5..d62b1864aa700 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart @@ -85,13 +85,13 @@ class MyApp { } _reportMouseInput( - data.physicalX, - data.physicalY, - nowNanos, - data.buttons, - data.change.name, - data.scrollDeltaX, - data.scrollDeltaY, + localX: data.physicalX, + localY: data.physicalY, + buttons: data.buttons, + phase: data.change.name, + timeReceived: nowNanos, + wheelXPhysicalPixel: data.scrollDeltaX, + wheelYPhysicalPixel: data.scrollDeltaY, ); } } diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart index 98b6d5b95a628..81ad14febefcb 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart @@ -151,9 +151,9 @@ class TestApp { if (data.change == PointerChange.down || data.change == PointerChange.move) { _reportTouchInput( - data.physicalX, - data.physicalY, - nowNanos, + localX: data.physicalX, + localY: data.physicalY, + timeReceived: nowNanos, ); } } @@ -217,7 +217,7 @@ class ChildView { Future _launchChildView() async { final message = Int8List.fromList([0x31]); - final completer = new Completer(); + final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { completer.complete(reply); diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart index d97e090e5a81b..63d4d1838a9dd 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart @@ -70,9 +70,9 @@ class TestApp { if (data.change == PointerChange.down || data.change == PointerChange.move) { _reportTouchInput( - data.physicalX, - data.physicalY, - nowNanos, + localX: data.physicalX, + localY: data.physicalY, + timeReceived: nowNanos, ); } } From e8331095fd5093498dbb2168cd3ba5e4b72feac6 Mon Sep 17 00:00:00 2001 From: Hzj_jie Date: Wed, 13 Mar 2024 10:15:24 -0700 Subject: [PATCH 19/19] address review comments --- .../embedder/parent-view/lib/parent_view.dart | 4 ++-- .../mouse-input-view/lib/mouse-input-view.dart | 14 +++++++------- .../lib/embedding-flutter-view.dart | 6 +++--- .../touch-input-view/lib/touch-input-view.dart | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart index 34125102b9df1..918bef8260b54 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/parent-view/lib/parent_view.dart @@ -179,10 +179,10 @@ class ChildView { Future _launchChildView() async { final message = Int8List.fromList([0x31]); - final completer = new Completer(); + final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { - completer.complete(reply); + completer.complete(reply!); }); return int.parse( diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart index d62b1864aa700..b3f2104c5747c 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/lib/mouse-input-view.dart @@ -100,13 +100,13 @@ class MyApp { } void _reportMouseInput( - double localX, - double localY, - int timeReceived, - int buttons, - String phase, - double wheelXPhysicalPixel, - double wheelYPhysicalPixel) { + {required double localX, + required double localY, + required int timeReceived, + required int buttons, + required String phase, + required double wheelXPhysicalPixel, + required double wheelYPhysicalPixel}) { print('mouse-input-view reporting mouse input to MouseInputListener'); final message = ByteData.sublistView(utf8.encode(json.encode({ 'method': 'MouseInputListener.ReportMouseInput', diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart index 81ad14febefcb..39a161a05ee44 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/embedding-flutter-view/lib/embedding-flutter-view.dart @@ -161,7 +161,7 @@ class TestApp { window.scheduleFrame(); } - void _reportTouchInput(double localX, double localY, int timeReceived) { + void _reportTouchInput({required double localX, required double localY, required int timeReceived}) { print('embedding-flutter-view reporting touch input to TouchInputListener'); final message = utf8.encode(json.encode({ 'method': 'TouchInputListener.ReportTouchInput', @@ -217,10 +217,10 @@ class ChildView { Future _launchChildView() async { final message = Int8List.fromList([0x31]); - final completer = new Completer(); + final completer = new Completer(); PlatformDispatcher.instance.sendPlatformMessage( 'fuchsia/child_view', ByteData.sublistView(message), (ByteData? reply) { - completer.complete(reply); + completer.complete(reply!); }); return int.parse( diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart index 63d4d1838a9dd..8032b1e4ba20b 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/touch-input-view/lib/touch-input-view.dart @@ -80,7 +80,7 @@ class TestApp { window.scheduleFrame(); } - void _reportTouchInput(double localX, double localY, int timeReceived) { + void _reportTouchInput({required double localX, required double localY, required int timeReceived}) { print('touch-input-view reporting touch input to TouchInputListener'); final message = utf8.encode(json.encode({ 'method': 'TouchInputListener.ReportTouchInput',