[flutter_releases] Flutter stable 3.22.3 Engine Cherrypicks (#53686)

itsjustkevin · mkustermann · eyebrowsoffire · web-flow · commit a5180e4ccbc1 · 2024-07-12T15:13:03.000-07:00
# Flutter stable 3.22.3 Engine ## Scheduled Cherrypicks - Roll dart revision: dart-lang/sdk@604651494 ### Dart - dart-lang/sdk#55979 - dart-lang/sdk#55943 ### Engine - flutter/flutter#149700 - flutter/flutter#149701 - flutter/flutter#149702 - flutter/flutter#149704 - flutter/flutter#149745 - flutter/flutter#149771 - #53183 --------- Co-authored-by: Martin Kustermann <kustermann@google.com> Co-authored-by: Jackson Gardner <eyebrowsoffire@gmail.com> Co-authored-by: Christopher Fujino <christopherfujino@gmail.com>
diff --git a/DEPS b/DEPS
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '1a849f91804e73a830844a5bf546a3f7027fc36d',
+  'dart_revision': '60465149414572c8ca189d8f65fdb39795c4b97d',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
@@ -176,20 +176,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Impeller-golden, dart and engine tests for host_release",
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--variant",
-                        "host_release",
-                        "--type",
-                        "dart,dart-host,engine,impeller-golden"
-                    ]
-                }
-            ]
+            }
         },
         {
             "archives": [
diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: accf41e49999ccd363df249912f8747d
+Signature: 552d859824fc2f0be0e5dbb43822a548
 
 ====================================================================================================
 LIBRARY: dart
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -40602,7 +40602,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart + ../../../flutte
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart + ../../../flutter/LICENSE
@@ -40639,7 +40638,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.da
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/svg.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart + ../../../flutter/LICENSE
@@ -43484,7 +43482,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/shadow.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/codecs.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/filters.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/font_collection.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/image.dart
@@ -43521,7 +43518,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/shaders.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/surface.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/vertices.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/renderer.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/svg.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/test_embedding.dart
diff --git a/lib/web_ui/lib/src/engine/browser_detection.dart b/lib/web_ui/lib/src/engine/browser_detection.dart
@@ -269,9 +269,7 @@ bool get isFirefox => browserEngine == BrowserEngine.firefox;
 bool get isEdge => domWindow.navigator.userAgent.contains('Edg/');
 
 /// Whether we are running from a wasm module compiled with dart2wasm.
-/// Note: Currently the ffi library is available from dart2wasm but not dart2js
-/// or dartdevc.
-bool get isWasm => const bool.fromEnvironment('dart.library.ffi');
+bool get isWasm => !const bool.fromEnvironment('dart.library.html');
 
 /// Use in tests to simulate the detection of iOS 15.
 bool? debugIsIOS15;
diff --git a/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart b/lib/web_ui/lib/src/engine/canvaskit/native_memory.dart
@@ -21,8 +21,8 @@ import 'package:ui/src/engine.dart';
 /// 5. The finalizer function is called with the SkPaint as the sole argument.
 /// 6. We call `delete` on SkPaint.
 DomFinalizationRegistry _finalizationRegistry = DomFinalizationRegistry(
-  (JSAny boxedUniq) {
-    final UniqueRef<Object> uniq = boxedUniq.fromJSWrapper as UniqueRef<Object>;
+  (ExternalDartReference boxedUniq) {
+    final UniqueRef<Object> uniq = boxedUniq.toDartObject as UniqueRef<Object>;
     uniq.collect();
   }.toJS
 );
@@ -34,7 +34,7 @@ NativeMemoryFinalizationRegistry nativeMemoryFinalizationRegistry = NativeMemory
 class NativeMemoryFinalizationRegistry {
   void register(Object owner, UniqueRef<Object> ref) {
     if (browserSupportsFinalizationRegistry) {
-      _finalizationRegistry.register(owner.toJSWrapper, ref.toJSWrapper);
+      _finalizationRegistry.register(owner.toExternalReference, ref.toExternalReference);
     }
   }
 }
diff --git a/lib/web_ui/lib/src/engine/dom.dart b/lib/web_ui/lib/src/engine/dom.dart
@@ -9,7 +9,6 @@ import 'dart:typed_data';
 
 import 'package:js/js_util.dart' as js_util;
 import 'package:meta/meta.dart';
-import 'package:ui/src/engine/skwasm/skwasm_stub.dart' if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
 
 import 'browser_detection.dart';
 
@@ -38,13 +37,6 @@ import 'browser_detection.dart';
 /// used carefully and only on types that are known to not contains `JSNull` and
 /// `JSUndefined`.
 extension ObjectToJSAnyExtension on Object {
-  // Once `Object.toJSBox` is faster (see
-  // https://github.com/dart-lang/sdk/issues/55183) we can remove this
-  // backend-specific workaround.
-  @pragma('wasm:prefer-inline')
-  @pragma('dart2js:tryInline')
-  JSAny get toJSWrapper => dartToJsWrapper(this);
-
   @pragma('wasm:prefer-inline')
   @pragma('dart2js:tryInline')
   JSAny get toJSAnyShallow {
@@ -61,10 +53,6 @@ extension ObjectToJSAnyExtension on Object {
 }
 
 extension JSAnyToObjectExtension on JSAny {
-  @pragma('wasm:prefer-inline')
-  @pragma('dart2js:tryInline')
-  Object get fromJSWrapper => jsWrapperToDart(this);
-
   @pragma('wasm:prefer-inline')
   @pragma('dart2js:tryInline')
   Object get toObjectShallow {
@@ -3674,13 +3662,14 @@ class DomFinalizationRegistry {
 
 extension DomFinalizationRegistryExtension on DomFinalizationRegistry {
   @JS('register')
-  external JSVoid register(JSAny target, JSAny value);
+  external JSVoid register(
+      ExternalDartReference target, ExternalDartReference value);
 
   @JS('register')
-  external JSVoid registerWithToken(JSAny target, JSAny value, JSAny token);
+  external JSVoid registerWithToken(ExternalDartReference target, ExternalDartReference value, ExternalDartReference token);
 
   @JS('unregister')
-  external JSVoid unregister(JSAny token);
+  external JSVoid unregister(ExternalDartReference token);
 }
 
 @JS('window.FinalizationRegistry')
diff --git a/lib/web_ui/lib/src/engine/renderer.dart b/lib/web_ui/lib/src/engine/renderer.dart
@@ -7,7 +7,7 @@ import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'package:ui/src/engine.dart';
-import 'package:ui/src/engine/skwasm/skwasm_stub.dart' if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart' if (dart.library.html) 'package:ui/src/engine/skwasm/skwasm_stub.dart';
 import 'package:ui/ui.dart' as ui;
 import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
 
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl.dart
@@ -11,7 +11,6 @@ import 'dart:ffi';
 
 export 'skwasm_impl/canvas.dart';
 export 'skwasm_impl/codecs.dart';
-export 'skwasm_impl/dart_js_conversion.dart';
 export 'skwasm_impl/filters.dart';
 export 'skwasm_impl/font_collection.dart';
 export 'skwasm_impl/image.dart';
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/dart_js_conversion.dart
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/memory.dart
@@ -28,21 +28,21 @@ typedef DisposeFunction<T extends NativeType> = void Function(Pointer<T>);
 
 class SkwasmFinalizationRegistry<T extends NativeType> {
   SkwasmFinalizationRegistry(this.dispose)
-    : registry = DomFinalizationRegistry(((JSNumber address) =>
-      dispose(Pointer<T>.fromAddress(address.toDartDouble.toInt()))
+    : registry = DomFinalizationRegistry(((ExternalDartReference address) =>
+      dispose(Pointer<T>.fromAddress(address.toDartObject as int))
     ).toJS);
 
   final DomFinalizationRegistry registry;
   final DisposeFunction<T> dispose;
 
   void register(SkwasmObjectWrapper<T> wrapper) {
-    final JSAny jsWrapper = wrapper.toJSWrapper;
+    final ExternalDartReference jsWrapper = wrapper.toExternalReference;
     registry.registerWithToken(
-        jsWrapper, wrapper.handle.address.toJS, jsWrapper);
+        jsWrapper, wrapper.handle.address.toExternalReference, jsWrapper);
   }
 
   void evict(SkwasmObjectWrapper<T> wrapper) {
-    final JSAny jsWrapper = wrapper.toJSWrapper;
+    final ExternalDartReference jsWrapper = wrapper.toExternalReference;
     registry.unregister(jsWrapper);
     dispose(wrapper.handle);
   }
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub.dart
@@ -6,5 +6,4 @@
 // ignore: unnecessary_library_directive
 library skwasm_stub;
 
-export 'skwasm_stub/dart_js_conversion.dart';
 export 'skwasm_stub/renderer.dart';
diff --git a/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart b/lib/web_ui/lib/src/engine/skwasm/skwasm_stub/dart_js_conversion.dart
diff --git a/lib/web_ui/test/canvaskit/canvaskit_api_test.dart b/lib/web_ui/test/canvaskit/canvaskit_api_test.dart
@@ -1929,7 +1929,7 @@ void _paragraphTests() {
     // So the test simply tests that a FinalizationRegistry can be constructed
     // and its `register` method can be called.
     final DomFinalizationRegistry registry = DomFinalizationRegistry((String arg) {}.toJS);
-    registry.register(Object().toJSWrapper, Object().toJSWrapper);
+    registry.register(Object().toExternalReference, Object().toExternalReference);
   });
 }
 
diff --git a/lib/web_ui/test/ui/utils.dart b/lib/web_ui/test/ui/utils.dart
@@ -5,8 +5,7 @@
 import 'dart:async';
 
 import 'package:ui/src/engine.dart';
-import 'package:ui/src/engine/skwasm/skwasm_stub.dart'
-    if (dart.library.ffi) 'package:ui/src/engine/skwasm/skwasm_impl.dart';
+import 'package:ui/src/engine/skwasm/skwasm_impl.dart' if (dart.library.html) 'package:ui/src/engine/skwasm/skwasm_stub.dart';
 import 'package:ui/ui.dart';
 
 import '../common/rendering.dart';
diff --git a/web_sdk/sdk_rewriter.dart b/web_sdk/sdk_rewriter.dart
@@ -102,7 +102,7 @@ const Set<String> rootLibraryNames = <String>{
 };
 
 final Map<Pattern, String> extraImportsMap = <Pattern, String>{
-  RegExp('skwasm_(stub|impl)'): "import 'dart:_skwasm_stub' if (dart.library.ffi) 'dart:_skwasm_impl';",
+  RegExp('skwasm_(stub|impl)'): "import 'dart:_skwasm_impl' if (dart.library.html) 'dart:_skwasm_stub';",
   'ui_web': "import 'dart:ui_web' as ui_web;",
   'engine': "import 'dart:_engine';",
   'web_unicode': "import 'dart:_web_unicode';",
diff --git a/web_sdk/test/sdk_rewriter_test.dart b/web_sdk/test/sdk_rewriter_test.dart
@@ -165,7 +165,7 @@ void printSomething() {
   test('gets correct extra imports', () {
     // Root libraries.
     expect(getExtraImportsForLibrary('engine'), <String>[
-      "import 'dart:_skwasm_stub' if (dart.library.ffi) 'dart:_skwasm_impl';",
+      "import 'dart:_skwasm_impl' if (dart.library.html) 'dart:_skwasm_stub';",
       "import 'dart:ui_web' as ui_web;",
       "import 'dart:_web_unicode';",
       "import 'dart:_web_test_fonts';",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Signature: accf41e49999ccd363df249912f8747d`
	`1`	`+Signature: 552d859824fc2f0be0e5dbb43822a548`
`2`	`2`
`3`	`3`	`====================================================================================================`
`4`	`4`	`LIBRARY: dart`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ import 'package:ui/src/engine.dart';`
`21`	`21`	`/// 5. The finalizer function is called with the SkPaint as the sole argument.`
`22`	`22`	/// 6. We call `delete` on SkPaint.
`23`	`23`	`DomFinalizationRegistry _finalizationRegistry = DomFinalizationRegistry(`
`24`		`- (JSAny boxedUniq) {`
`25`		`- final UniqueRef<Object> uniq = boxedUniq.fromJSWrapper as UniqueRef<Object>;`
	`24`	`+ (ExternalDartReference boxedUniq) {`
	`25`	`+ final UniqueRef<Object> uniq = boxedUniq.toDartObject as UniqueRef<Object>;`
`26`	`26`	`uniq.collect();`
`27`	`27`	`}.toJS`
`28`	`28`	`);`
`@@ -34,7 +34,7 @@ NativeMemoryFinalizationRegistry nativeMemoryFinalizationRegistry = NativeMemory`
`34`	`34`	`class NativeMemoryFinalizationRegistry {`
`35`	`35`	`void register(Object owner, UniqueRef<Object> ref) {`
`36`	`36`	`if (browserSupportsFinalizationRegistry) {`
`37`		`- _finalizationRegistry.register(owner.toJSWrapper, ref.toJSWrapper);`
	`37`	`+ _finalizationRegistry.register(owner.toExternalReference, ref.toExternalReference);`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`