Get unit tests working with dart2wasm

ci/licenses_golden/licenses_flutter

@@ -2061,7 +2061,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_action.dar
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_type.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/ulps.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/util.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart + ../../../flutter/LICENSE
@@ -4543,7 +4542,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_action.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/input_type.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_capitalization.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/text_editing/text_editing.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/ulps.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/util.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart

lib/web_ui/dev/browser_lock.yaml

@@ -13,11 +13,11 @@ chrome:
   # `self.m.platform.name.capitalize()` evaluates to. See:
   #
   # recipe_modules/web_util/api.py
-  Linux: 1047731
-  Mac: 1047732
-  Mac_Arm: 1047734
-  Win: 1047731
-  version: '107.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
+  Linux: 1084013
+  Mac: 1084013
+  Mac_Arm: 1084001
+  Win: 1084062
+  version: '110.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
 
 firefox:
   version: '106.0'

lib/web_ui/dev/chrome.dart

@@ -101,6 +101,8 @@ class Chrome extends Browser {
           '--start-maximized',
         if (debug)
           '--auto-open-devtools-for-tabs',
+        // Always run unit tests at a 1x scale factor
+        '--force-device-scale-factor=1',
         '--disable-extensions',
         '--disable-popup-blocking',
         // Indicates that the browser is in "browse without sign-in" (Guest session) mode.

lib/web_ui/dev/felt

@@ -30,7 +30,7 @@ ENGINE_SRC_DIR="$(dirname $(dirname $(dirname $(dirname ${FELT_DIR}))))"
 FLUTTER_DIR="${ENGINE_SRC_DIR}/flutter"
 SDK_PREBUILTS_DIR="${FLUTTER_DIR}/prebuilts"
 
-if [ -z "${DART_SDK_DIR}"]
+if [ -z "${DART_SDK_DIR}" ]
 then
   if [[ $KERNEL_NAME == *"Darwin"* ]]
   then

lib/web_ui/dev/steps/compile_tests_step.dart

@@ -345,6 +345,7 @@ Future<bool> compileUnitTestToWasm(FilePath input, {required Renderer renderer})
     environment.dart2wasmSnapshotPath,
 
     '--dart-sdk=${environment.dartSdkDir.path}',
+    '--enable-asserts',
 
     // We do not want to auto-select a renderer in tests. As of today, tests
     // are designed to run in one specific mode. So instead, we specify the

lib/web_ui/dev/steps/run_tests_step.dart

@@ -132,7 +132,10 @@ class RunTestsStep implements PipelineStep {
   Future<SkiaGoldClient?> _createSkiaClient() async {
     final SkiaGoldClient skiaClient = SkiaGoldClient(
       environment.webUiSkiaGoldDirectory,
-      dimensions: <String, String> {'Browser': browserName},
+      dimensions: <String, String> {
+        'Browser': browserName,
+        if (isWasm) 'Wasm': 'true',
+      },
     );
 
     if (await _checkSkiaClient(skiaClient)) {

lib/web_ui/lib/src/engine/browser_detection.dart

@@ -226,6 +226,11 @@ bool get isFirefox => browserEngine == BrowserEngine.firefox;
 /// Whether the current browser is Edge.
 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');
+
 /// Use in tests to simulate the detection of iOS 15.
 bool? debugIsIOS15;
 

lib/web_ui/lib/src/engine/canvaskit/canvas.dart

@@ -118,7 +118,7 @@ class CkCanvas {
 
   void drawColor(ui.Color color, ui.BlendMode blendMode) {
     skCanvas.drawColorInt(
-      color.value,
+      color.value.toDouble(),
       toSkBlendMode(blendMode),
     );
   }
@@ -266,7 +266,7 @@ class CkCanvas {
   }
 
   void restoreToCount(int count) {
-    skCanvas.restoreToCount(count);
+    skCanvas.restoreToCount(count.toDouble());
   }
 
   void rotate(double radians) {
@@ -654,7 +654,7 @@ class CkRestoreToCountCommand extends CkPaintCommand {
 
   @override
   void apply(SkCanvas canvas) {
-    canvas.restoreToCount(count);
+    canvas.restoreToCount(count.toDouble());
   }
 }
 
@@ -821,7 +821,7 @@ class CkDrawColorCommand extends CkPaintCommand {
   @override
   void apply(SkCanvas canvas) {
     canvas.drawColorInt(
-      color.value,
+      color.value.toDouble(),
       toSkBlendMode(blendMode),
     );
   }

lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

@@ -88,8 +88,8 @@ extension CanvasKitExtension on CanvasKit {
   external SkTextStyle TextStyle(SkTextStyleProperties properties);
   external SkSurface MakeWebGLCanvasSurface(DomCanvasElement canvas);
   external SkSurface MakeSurface(
-    int width,
-    int height,
+    double width,
+    double height,
   );
   external Uint8List getDataBytes(
     SkData skData,
@@ -111,11 +111,11 @@ extension CanvasKitExtension on CanvasKit {
   external SkTypefaceFactory get Typeface;
   external double GetWebGLContext(
       DomCanvasElement canvas, SkWebGLContextOptions options);
-  external SkGrContext MakeGrContext(int glContext);
+  external SkGrContext MakeGrContext(double glContext);
   external SkSurface? MakeOnScreenGLSurface(
     SkGrContext grContext,
-    int width,
-    int height,
+    double width,
+    double height,
     ColorSpace colorSpace,
     int sampleCount,
     int stencil,
@@ -132,7 +132,7 @@ extension CanvasKitExtension on CanvasKit {
   external SkImage? MakeImage(
     SkImageInfo info,
     Uint8List pixels,
-    int bytesPerRow,
+    double bytesPerRow,
   );
   external SkImage? MakeLazyImageFromTextureSource(
     Object src,
@@ -194,7 +194,7 @@ extension SkSurfaceExtension on SkSurface {
 class SkGrContext {}
 
 extension SkGrContextExtension on SkGrContext {
-  external void setResourceCacheLimitBytes(int limit);
+  external void setResourceCacheLimitBytes(double limit);
   external void releaseResourcesAndAbandonContext();
   external void delete();
 }
@@ -952,7 +952,7 @@ extension SkImageExtension on SkImage {
     SkMipmapMode mipmapMode,
     Float32List? matrix, // 3x3 matrix
   );
-  external Uint8List readPixels(int srcX, int srcY, SkImageInfo imageInfo);
+  external Uint8List readPixels(double srcX, double srcY, SkImageInfo imageInfo);
   external Uint8List? encodeToBytes();
   external bool isAliasOf(SkImage other);
   external bool isDeleted();
@@ -979,7 +979,7 @@ extension SkShaderNamespaceExtension on SkShaderNamespace {
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
   );
 
   external SkShader MakeTwoPointConicalGradient(
@@ -991,7 +991,7 @@ extension SkShaderNamespaceExtension on SkShaderNamespace {
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
   );
 
   external SkShader MakeSweepGradient(
@@ -1001,7 +1001,7 @@ extension SkShaderNamespaceExtension on SkShaderNamespace {
     Float32List colorStops,
     SkTileMode tileMode,
     Float32List? matrix, // 3x3 matrix
-    int flags,
+    double flags,
     double startAngle,
     double endAngle,
   );
@@ -1045,7 +1045,7 @@ extension SkPaintExtension on SkPaint {
   external void setStrokeCap(SkStrokeCap cap);
   external void setStrokeJoin(SkStrokeJoin join);
   external void setAntiAlias(bool isAntiAlias);
-  external void setColorInt(int color);
+  external void setColorInt(double color);
   external void setShader(SkShader? shader);
   external void setMaskFilter(SkMaskFilter? maskFilter);
   external void setColorFilter(SkColorFilter? colorFilter);
@@ -1272,22 +1272,22 @@ external _NativeType get _nativeFloat32ArrayType;
 external _NativeType get _nativeUint32ArrayType;
 
 @JS('window.flutterCanvasKit.Malloc')
-external Object _malloc(_NativeType nativeType, int length);
+external Object _malloc(_NativeType nativeType, double length);
 
 /// Allocates a [Float32List] of [length] elements, backed by WASM memory,
 /// managed by a [SkFloat32List].
 ///
 /// To free the allocated array use [free].
 SkFloat32List mallocFloat32List(int length) {
-  return _malloc(_nativeFloat32ArrayType, length) as SkFloat32List;
+  return _malloc(_nativeFloat32ArrayType, length.toDouble()) as SkFloat32List;
 }
 
 /// Allocates a [Uint32List] of [length] elements, backed by WASM memory,
 /// managed by a [SkUint32List].
 ///
 /// To free the allocated array use [free].
 SkUint32List mallocUint32List(int length) {
-  return _malloc(_nativeUint32ArrayType, length) as SkUint32List;
+  return _malloc(_nativeUint32ArrayType, length.toDouble()) as SkUint32List;
 }
 
 /// Frees the WASM memory occupied by a [SkFloat32List] or [SkUint32List].
@@ -1313,7 +1313,7 @@ class SkFloat32List extends MallocObj {}
 
 extension SkFloat32ListExtension on SkFloat32List {
   /// The number of objects this pointer refers to.
-  external int length;
+  external double length;
 
   /// Returns the [Float32List] object backed by WASM memory.
   ///
@@ -1336,7 +1336,7 @@ class SkUint32List extends MallocObj {}
 
 extension SkUint32ListExtension on SkUint32List {
   /// The number of objects this pointer refers to.
-  external int length;
+  external double length;
 
   /// Returns the [Uint32List] object backed by WASM memory.
   ///
@@ -1408,7 +1408,7 @@ extension SkPathExtension on SkPath {
   external void addOval(
     Float32List oval,
     bool counterClockWise,
-    int startIndex,
+    double startIndex,
   );
   external void addPath(
     SkPath other,
@@ -1721,7 +1721,7 @@ extension SkCanvasExtension on SkCanvas {
     SkPaint paint,
   );
   external void drawColorInt(
-    int color,
+    double color,
     SkBlendMode blendMode,
   );
   external void drawDRRect(
@@ -1806,7 +1806,7 @@ extension SkCanvasExtension on SkCanvas {
     double lightRadius,
     Float32List ambientColor,
     Float32List spotColor,
-    int flags,
+    double flags,
   );
   external void drawVertices(
     SkVertices vertices,
@@ -1822,7 +1822,7 @@ extension SkCanvasExtension on SkCanvas {
     int? flags,
   );
   external void restore();
-  external void restoreToCount(int count);
+  external void restoreToCount(double count);
   external void rotate(
     double angleDegrees,
     double px,
@@ -2126,7 +2126,7 @@ extension SkFontExtension on SkFont {
 class SkFontMgr {}
 
 extension SkFontMgrExtension on SkFontMgr {
-  external String? getFamilyName(int fontId);
+  external String? getFamilyName(double fontId);
   external void delete();
   external SkTypeface? MakeTypefaceFromData(Uint8List font);
 }
@@ -2187,8 +2187,8 @@ extension SkParagraphExtension on SkParagraph {
   external double getMinIntrinsicWidth();
   external double getMaxWidth();
   external /* List<SkRectWithDirection> */ List<Object?> getRectsForRange(
-    int start,
-    int end,
+    double start,
+    double end,
     SkRectHeightStyle heightStyle,
     SkRectWidthStyle widthStyle,
   );
@@ -2197,7 +2197,7 @@ extension SkParagraphExtension on SkParagraph {
     double x,
     double y,
   );
-  external SkTextRange getWordBoundary(int position);
+  external SkTextRange getWordBoundary(double position);
   external void layout(double width);
   external void delete();
 }
@@ -2523,8 +2523,8 @@ extension SkDataExtension on SkData {
 @staticInterop
 class SkImageInfo {
   external factory SkImageInfo({
-    required int width,
-    required int height,
+    required double width,
+    required double height,
     required SkColorType colorType,
     required SkAlphaType alphaType,
     required ColorSpace colorSpace,
@@ -2543,16 +2543,16 @@ extension SkImageInfoExtension on SkImageInfo {
   external SkImageInfo makeAlphaType(SkAlphaType alphaType);
   external SkImageInfo makeColorSpace(ColorSpace colorSpace);
   external SkImageInfo makeColorType(SkColorType colorType);
-  external SkImageInfo makeWH(int width, int height);
+  external SkImageInfo makeWH(double width, double height);
 }
 
 @JS()
 @anonymous
 @staticInterop
 class SkPartialImageInfo {
   external factory SkPartialImageInfo({
-    required int width,
-    required int height,
+    required double width,
+    required double height,
     required SkColorType colorType,
     required SkAlphaType alphaType,
     required ColorSpace colorSpace,

lib/web_ui/lib/src/engine/canvaskit/image.dart

@@ -57,14 +57,14 @@ void skiaDecodeImageFromPixels(
   Timer.run(() {
     final SkImage? skImage = canvasKit.MakeImage(
       SkImageInfo(
-        width: width,
-        height: height,
+        width: width.toDouble(),
+        height: height.toDouble(),
         colorType: format == ui.PixelFormat.rgba8888 ? canvasKit.ColorType.RGBA_8888 : canvasKit.ColorType.BGRA_8888,
         alphaType: canvasKit.AlphaType.Premul,
         colorSpace: SkColorSpaceSRGB,
       ),
       pixels,
-      rowBytes ?? 4 * width,
+      (rowBytes ?? 4 * width).toDouble(),
     );
 
     if (skImage == null) {
@@ -266,11 +266,11 @@ class CkImage implements ui.Image, StackTraceDebugger {
             alphaType: canvasKit.AlphaType.Premul,
             colorType: canvasKit.ColorType.RGBA_8888,
             colorSpace: SkColorSpaceSRGB,
-            width: originalWidth,
-            height: originalHeight,
+            width: originalWidth.toDouble(),
+            height: originalHeight.toDouble(),
           ),
           originalBytes.buffer.asUint8List(),
-          4 * originalWidth,
+          (4 * originalWidth).toDouble(),
         );
         if (skImage == null) {
           throw ImageCodecException(
@@ -415,8 +415,8 @@ class CkImage implements ui.Image, StackTraceDebugger {
         alphaType: alphaType,
         colorType: colorType,
         colorSpace: colorSpace,
-        width: skImage.width().toInt(),
-        height: skImage.height().toInt(),
+        width: skImage.width(),
+        height: skImage.height(),
       );
       bytes = skImage.readPixels(0, 0, imageInfo);
     } else {