add non-recording canvas test; fix Firefox test

Author: yjbanov

lib/web_ui/dev/test_runner.dart

@@ -436,39 +436,39 @@ class TestCommand extends Command<bool> with ArgUtils {
       'test',
     ));
 
-    if (isUnitTestsScreenshotsAvailable) {
-      // Separate screenshot tests from unit-tests. Screenshot tests must run
-      // one at a time. Otherwise, they will end up screenshotting each other.
-      // This is not an issue for unit-tests.
-      final FilePath failureSmokeTestPath = FilePath.fromWebUi(
-        'test/golden_tests/golden_failure_smoke_test.dart',
-      );
-      final List<FilePath> screenshotTestFiles = <FilePath>[];
-      final List<FilePath> unitTestFiles = <FilePath>[];
-
-      for (io.File testFile
-          in testDir.listSync(recursive: true).whereType<io.File>()) {
-        final FilePath testFilePath = FilePath.fromCwd(testFile.path);
-        if (!testFilePath.absolute.endsWith('_test.dart')) {
-          // Not a test file at all. Skip.
-          continue;
-        }
-        if (testFilePath == failureSmokeTestPath) {
-          // A smoke test that fails on purpose. Skip.
-          continue;
-        }
+    // Separate screenshot tests from unit-tests. Screenshot tests must run
+    // one at a time. Otherwise, they will end up screenshotting each other.
+    // This is not an issue for unit-tests.
+    final FilePath failureSmokeTestPath = FilePath.fromWebUi(
+      'test/golden_tests/golden_failure_smoke_test.dart',
+    );
+    final List<FilePath> screenshotTestFiles = <FilePath>[];
+    final List<FilePath> unitTestFiles = <FilePath>[];
+
+    for (io.File testFile
+        in testDir.listSync(recursive: true).whereType<io.File>()) {
+      final FilePath testFilePath = FilePath.fromCwd(testFile.path);
+      if (!testFilePath.absolute.endsWith('_test.dart')) {
+        // Not a test file at all. Skip.
+        continue;
+      }
+      if (testFilePath == failureSmokeTestPath) {
+        // A smoke test that fails on purpose. Skip.
+        continue;
+      }
 
-        // All files under test/golden_tests are considered golden tests.
-        final bool isUnderGoldenTestsDirectory = path.split(testFilePath.relativeToWebUi).contains('golden_tests');
-        // Any file whose name ends with "_golden_test.dart" is run as a golden test.
-        final bool isGoldenTestFile = path.basename(testFilePath.relativeToWebUi).endsWith('_golden_test.dart');
-        if (isUnderGoldenTestsDirectory || isGoldenTestFile) {
-          screenshotTestFiles.add(testFilePath);
-        } else {
-          unitTestFiles.add(testFilePath);
-        }
+      // All files under test/golden_tests are considered golden tests.
+      final bool isUnderGoldenTestsDirectory = path.split(testFilePath.relativeToWebUi).contains('golden_tests');
+      // Any file whose name ends with "_golden_test.dart" is run as a golden test.
+      final bool isGoldenTestFile = path.basename(testFilePath.relativeToWebUi).endsWith('_golden_test.dart');
+      if (isUnderGoldenTestsDirectory || isGoldenTestFile) {
+        screenshotTestFiles.add(testFilePath);
+      } else {
+        unitTestFiles.add(testFilePath);
       }
+    }
 
+    if (isUnitTestsScreenshotsAvailable) {
       // This test returns a non-zero exit code on purpose. Run it separately.
       if (io.Platform.environment['CIRRUS_CI'] != 'true') {
         await _runTestBatch(
@@ -478,11 +478,13 @@ class TestCommand extends Command<bool> with ArgUtils {
         );
         _checkExitCode();
       }
+    }
 
-      // Run all unit-tests as a single batch.
-      await _runTestBatch(unitTestFiles, concurrency: 10, expectFailure: false);
-      _checkExitCode();
+    // Run all unit-tests as a single batch.
+    await _runTestBatch(unitTestFiles, concurrency: 10, expectFailure: false);
+    _checkExitCode();
 
+    if (isUnitTestsScreenshotsAvailable) {
       // Run screenshot tests one at a time.
       for (FilePath testFilePath in screenshotTestFiles) {
         await _runTestBatch(
@@ -492,24 +494,6 @@ class TestCommand extends Command<bool> with ArgUtils {
         );
         _checkExitCode();
       }
-    } else {
-      final List<FilePath> unitTestFiles = <FilePath>[];
-      for (io.File testFile
-          in testDir.listSync(recursive: true).whereType<io.File>()) {
-        final FilePath testFilePath = FilePath.fromCwd(testFile.path);
-        if (!testFilePath.absolute.endsWith('_test.dart')) {
-          // Not a test file at all. Skip.
-          continue;
-        }
-        if (!path
-            .split(testFilePath.relativeToWebUi)
-            .contains('golden_tests')) {
-          unitTestFiles.add(testFilePath);
-        }
-      }
-      // Run all unit-tests as a single batch.
-      await _runTestBatch(unitTestFiles, concurrency: 10, expectFailure: false);
-      _checkExitCode();
     }
   }
 

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

@@ -703,7 +703,6 @@ class CkParagraphBuilder implements ui.ParagraphBuilder {
     _styleStack.add(skStyle);
     _commands.add(_ParagraphCommand.pushStyle(ckStyle));
     if (skStyle.foreground != null || skStyle.background != null) {
-      // TODO(yjbanov): https://github.com/flutter/flutter/issues/71512
       final SkPaint foreground = skStyle.foreground?.skiaObject ?? SkPaint();
       final SkPaint background = skStyle.background?.skiaObject ?? SkPaint();
       _paragraphBuilder.pushPaintStyle(

lib/web_ui/test/canvaskit/canvas_golden_test.dart

@@ -35,7 +35,18 @@ void testMain() {
   group('CkCanvas', () {
     setUpCanvasKitTest();
 
-    test('can restore a picture from a snapshot', () async {
+    test('renders using non-recording canvas if weak refs are supported', () async {
+      expect(browserSupportsFinalizationRegistry, isTrue,
+          reason: 'This test specifically tests non-recording canvas, which '
+                  'only works if FinalizationRegistry is available.');
+      final CkPictureRecorder recorder = CkPictureRecorder();
+      final CkCanvas canvas = recorder.beginRecording(region);
+      expect(canvas.runtimeType, CkCanvas);
+      drawTestPicture(canvas);
+      await matchPictureGolden('canvaskit_picture_original.png', recorder.endRecording());
+    });
+
+    test('renders using a recording canvas if weak refs are not supported', () async {
       browserSupportsFinalizationRegistry = false;
       final CkPictureRecorder recorder = CkPictureRecorder();
       final CkCanvas canvas = recorder.beginRecording(region);
@@ -47,6 +58,7 @@ void testMain() {
 
       final ByteData originalPixels = await (await originalPicture.toImage(50, 50)).toByteData() as ByteData;
 
+      // Test that a picture restored from a snapshot looks the same.
       final CkPictureSnapshot? snapshot = canvas.pictureSnapshot;
       expect(snapshot, isNotNull);
       final SkPicture restoredSkPicture = snapshot!.toPicture();

lib/web_ui/test/canvaskit/canvaskit_api_test.dart

@@ -1169,6 +1169,10 @@ void _canvasTests() {
   });
 
   test('toImage.toByteData', () async {
+    // Pretend that FinalizationRegistry is supported, so we can run this
+    // test in older browsers (the test will use a TestCollector instead of
+    // ProductionCollector)
+    browserSupportsFinalizationRegistry = true;
     final SkPictureRecorder otherRecorder = SkPictureRecorder();
     final SkCanvas otherCanvas =
         otherRecorder.beginRecording(Float32List.fromList([0, 0, 1, 1]));