diff --git a/lib/web_ui/dev/README.md b/lib/web_ui/dev/README.md index c38108e5607cf..ebc9211c46da5 100644 --- a/lib/web_ui/dev/README.md +++ b/lib/web_ui/dev/README.md @@ -20,3 +20,15 @@ or: ``` felt build --watch ``` + +## Configuration files + +`chrome_lock.yaml` contains the version of Chrome we use to test Flutter for +web. Chrome is not automatically updated whenever a new release is available. +Instead, we update this file manually once in a while. + +`goldens_lock.yaml` refers to a revision in the https://github.com/flutter/goldens +repo. Screenshot tests are compared with the golden files at that revision. +When making engine changes that affect screenshots, first submit a PR to +flutter/goldens updating the screenshots. Then update this file pointing to +the new revision. diff --git a/lib/web_ui/dev/environment.dart b/lib/web_ui/dev/environment.dart index c1b85847c75d4..c6c0854232421 100644 --- a/lib/web_ui/dev/environment.dart +++ b/lib/web_ui/dev/environment.dart @@ -103,4 +103,17 @@ class Environment { webUiRootDir.path, '.dart_tool', )); + + /// Path to the "dev" directory containing engine developer tools and + /// configuration files. + io.Directory get webUiDevDir => io.Directory(pathlib.join( + webUiRootDir.path, + 'dev', + )); + + /// Path to the clone of the flutter/goldens repository. + io.Directory get webUiGoldensRepositoryDirectory => io.Directory(pathlib.join( + webUiDartToolDir.path, + 'goldens', + )); } diff --git a/lib/web_ui/dev/goldens.dart b/lib/web_ui/dev/goldens.dart index d0dc5bd03d304..3ab47db707e13 100644 --- a/lib/web_ui/dev/goldens.dart +++ b/lib/web_ui/dev/goldens.dart @@ -3,6 +3,11 @@ // found in the LICENSE file. import 'dart:io' as io; import 'package:image/image.dart'; +import 'package:path/path.dart' as path; +import 'package:yaml/yaml.dart'; + +import 'environment.dart'; +import 'utils.dart'; void main(List args) { final io.File fileA = io.File(args[0]); @@ -10,7 +15,7 @@ void main(List args) { final Image imageA = decodeNamedImage(fileA.readAsBytesSync(), 'a.png'); final Image imageB = decodeNamedImage(fileB.readAsBytesSync(), 'b.png'); final ImageDiff diff = ImageDiff(golden: imageA, other: imageB); - print('Diff: ${(diff.rate * 100).toStringAsFixed(4)}'); + print('Diff: ${(diff.rate * 100).toStringAsFixed(4)}%'); } /// This class encapsulates visually diffing an Image with any other. @@ -140,3 +145,72 @@ class ImageDiff { String getPrintableDiffFilesInfo(double diffRate, double maxRate) => '(${((diffRate) * 100).toStringAsFixed(4)}% of pixels were different. ' 'Maximum allowed rate is: ${(maxRate * 100).toStringAsFixed(4)}%).'; + +/// Fetches golden files from github.com/flutter/goldens, cloning the repository if necessary. +/// +/// The repository is cloned into web_ui/.dart_tool. +Future fetchGoldens() async { + await _GoldensRepoFetcher().fetch(); +} + +class _GoldensRepoFetcher { + String _repository; + String _revision; + + Future fetch() async { + final io.File lockFile = io.File( + path.join(environment.webUiDevDir.path, 'goldens_lock.yaml') + ); + final YamlMap lock = loadYaml(lockFile.readAsStringSync()); + _repository = lock['repository']; + _revision = lock['revision']; + + final String localRevision = await _getLocalRevision(); + if (localRevision == _revision) { + return; + } + + print('Fetching $_repository@$_revision'); + + if (!environment.webUiGoldensRepositoryDirectory.existsSync()) { + environment.webUiGoldensRepositoryDirectory.createSync(recursive: true); + await runProcess( + 'git', + ['init'], + workingDirectory: environment.webUiGoldensRepositoryDirectory.path, + mustSucceed: true, + ); + await runProcess( + 'git', + ['remote', 'add', 'origin', _repository], + workingDirectory: environment.webUiGoldensRepositoryDirectory.path, + mustSucceed: true, + ); + } + + await runProcess( + 'git', + ['fetch', 'origin', 'master'], + workingDirectory: environment.webUiGoldensRepositoryDirectory.path, + mustSucceed: true, + ); + await runProcess( + 'git', + ['checkout', _revision], + workingDirectory: environment.webUiGoldensRepositoryDirectory.path, + mustSucceed: true, + ); + } + + Future _getLocalRevision() async { + final io.File head = io.File(path.join( + environment.webUiGoldensRepositoryDirectory.path, '.git', 'HEAD' + )); + + if (!head.existsSync()) { + return null; + } + + return head.readAsStringSync().trim(); + } +} diff --git a/lib/web_ui/dev/goldens_lock.yaml b/lib/web_ui/dev/goldens_lock.yaml new file mode 100644 index 0000000000000..1b72c1367e6bf --- /dev/null +++ b/lib/web_ui/dev/goldens_lock.yaml @@ -0,0 +1,2 @@ +repository: https://github.com/flutter/goldens.git +revision: dd993a32c23c5c542f083134467e7cda09cac975 diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart index 339e4fa0bc18f..ab2c08c675d92 100644 --- a/lib/web_ui/dev/test_platform.dart +++ b/lib/web_ui/dev/test_platform.dart @@ -147,10 +147,28 @@ class BrowserPlatform extends PlatformPlugin { } Future _diffScreenshot(String filename, bool write, [ Map region ]) async { - const String _kGoldensDirectory = 'test/golden_files'; + String goldensDirectory; + if (filename.startsWith('__local__')) { + filename = filename.substring('__local__/'.length); + goldensDirectory = p.join( + env.environment.webUiRootDir.path, + 'test', + 'golden_files', + ); + } else { + await fetchGoldens(); + goldensDirectory = p.join( + env.environment.webUiGoldensRepositoryDirectory.path, + 'engine', + 'web', + ); + } // Bail out fast if golden doesn't exist, and user doesn't want to create it. - final File file = File(p.join(_kGoldensDirectory, filename)); + final File file = File(p.join( + goldensDirectory, + filename, + )); if (!file.existsSync() && !write) { return ''' Golden file $filename does not exist. diff --git a/lib/web_ui/dev/utils.dart b/lib/web_ui/dev/utils.dart index 9078648fb9feb..e44909c8cdc18 100644 --- a/lib/web_ui/dev/utils.dart +++ b/lib/web_ui/dev/utils.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:io' as io; +import 'package:meta/meta.dart'; import 'package:path/path.dart' as path; import 'environment.dart'; @@ -31,17 +32,54 @@ class FilePath { String toString() => _absolutePath; } +/// Runs [executable] merging its output into the current process' standard out and standard error. Future runProcess( String executable, List arguments, { String workingDirectory, + bool mustSucceed: false, }) async { final io.Process process = await io.Process.start( executable, arguments, workingDirectory: workingDirectory, ); - return _forwardIOAndWait(process); + final int exitCode = await _forwardIOAndWait(process); + if (mustSucceed && exitCode != 0) { + throw ProcessException( + description: 'Sub-process failed.', + executable: executable, + arguments: arguments, + workingDirectory: workingDirectory, + exitCode: exitCode, + ); + } + return exitCode; +} + +/// Runs [executable] and returns its standard output as a string. +/// +/// If the process fails, throws a [ProcessException]. +Future evalProcess( + String executable, + List arguments, { + String workingDirectory, +}) async { + final io.ProcessResult result = await io.Process.run( + executable, + arguments, + workingDirectory: workingDirectory, + ); + if (result.exitCode != 0) { + throw ProcessException( + description: result.stderr, + executable: executable, + arguments: arguments, + workingDirectory: workingDirectory, + exitCode: result.exitCode, + ); + } + return result.stdout; } Future _forwardIOAndWait(io.Process process) { @@ -53,3 +91,31 @@ Future _forwardIOAndWait(io.Process process) { return exitCode; }); } + +@immutable +class ProcessException implements Exception { + ProcessException({ + @required this.description, + @required this.executable, + @required this.arguments, + @required this.workingDirectory, + @required this.exitCode, + }); + + final String description; + final String executable; + final List arguments; + final String workingDirectory; + final int exitCode; + + @override + String toString() { + final StringBuffer message = StringBuffer(); + message + ..writeln(description) + ..writeln('Command: $executable ${arguments.join(' ')}') + ..writeln('Working directory: ${workingDirectory ?? io.Directory.current.path}') + ..writeln('Exit code: $exitCode'); + return '$message'; + } +} diff --git a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png b/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png deleted file mode 100644 index 899fdbbfa8920..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png b/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png deleted file mode 100644 index 8c868e0286349..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png b/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png deleted file mode 100644 index 2a81d5d98c959..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png b/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png deleted file mode 100644 index 1a9fffd5b21d7..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png b/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png deleted file mode 100644 index 1ab3e710d3ea2..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png b/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png deleted file mode 100644 index e0830c26372c7..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_clip_path.png b/lib/web_ui/test/golden_files/engine/compositing_clip_path.png deleted file mode 100644 index e788891ea48f0..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_clip_path.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png b/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png deleted file mode 100644 index d4a4076f9efa9..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png deleted file mode 100644 index b487f7ccd7970..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png deleted file mode 100644 index e9f7e740305a2..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png deleted file mode 100644 index 1086382463ac1..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png deleted file mode 100644 index ff42ce368c230..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png deleted file mode 100644 index 89f95faa35f45..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png deleted file mode 100644 index e585e3a650b78..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png deleted file mode 100644 index a5f776bb1a4bc..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png b/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png deleted file mode 100644 index ab137f0d9f817..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png b/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png deleted file mode 100644 index ab137f0d9f817..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png deleted file mode 100644 index 747da6a859561..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 7fe1a60c4feda..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png deleted file mode 100644 index 7fe1a60c4feda..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png deleted file mode 100644 index d8284f456c9c2..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png deleted file mode 100644 index b1448461a89d6..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index dbb6ed4b3cffa..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png deleted file mode 100644 index dbb6ed4b3cffa..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png deleted file mode 100644 index ef66da5e2a9f4..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png deleted file mode 100644 index 02f111fefcb74..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 1ba8bfbeb47c1..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png deleted file mode 100644 index 1ba8bfbeb47c1..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png deleted file mode 100644 index d88dbaa4ce0fc..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png deleted file mode 100644 index afd6cfedf95e0..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 951f9fb1ca4bd..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png deleted file mode 100644 index 9585084d42ed7..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png deleted file mode 100644 index afa820b84ce66..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png deleted file mode 100644 index e6812a18c998f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 1d9612f568abe..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png deleted file mode 100644 index 390a9b5c96777..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png deleted file mode 100644 index cdcff01b07297..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png deleted file mode 100644 index 519ea934f63b8..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png deleted file mode 100644 index af9b8a67e36b0..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png deleted file mode 100644 index 201eb2f9bfa51..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png deleted file mode 100644 index f610e9b11d8eb..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png deleted file mode 100644 index 3b47f116110fc..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png deleted file mode 100644 index c6057629e56cb..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png deleted file mode 100644 index a4b5a13ba94cb..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png deleted file mode 100644 index 6e9b4a45bf104..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png deleted file mode 100644 index 04fdfee6e767b..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png deleted file mode 100644 index dad6fb69e2c40..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png deleted file mode 100644 index d966856dca6ef..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png deleted file mode 100644 index 64ec011396a6b..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png deleted file mode 100644 index 86123f08954f2..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png deleted file mode 100644 index ba2a222adbbfb..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png deleted file mode 100644 index 7af503c5ced67..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png deleted file mode 100644 index 5546e3a068639..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png deleted file mode 100644 index 4e5e2b9cef443..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png deleted file mode 100644 index a2e0ff534afef..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png deleted file mode 100644 index adab8ea3b1b28..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png deleted file mode 100644 index 7c2624a6b9687..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png deleted file mode 100644 index 2cef4d1d42577..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png deleted file mode 100644 index dad6fb69e2c40..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png deleted file mode 100644 index e7ee55e49a81e..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png deleted file mode 100644 index 873419f1b6b16..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png deleted file mode 100644 index c02314d98191e..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png deleted file mode 100644 index 058268ba77fb8..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png deleted file mode 100644 index c81838d4a7f61..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png deleted file mode 100644 index 073d3b7733d0c..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png deleted file mode 100644 index 009d409baf15f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png deleted file mode 100644 index 8202a973f90f7..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png deleted file mode 100644 index 259b1a2e7018c..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index ef2d87bd14a3f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png deleted file mode 100644 index ef2d87bd14a3f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png deleted file mode 100644 index ef2d87bd14a3f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png deleted file mode 100644 index ef2d87bd14a3f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png deleted file mode 100644 index cfd40afe7e180..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png deleted file mode 100644 index cfd40afe7e180..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 5de61ff7755b4..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png deleted file mode 100644 index 5de61ff7755b4..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png deleted file mode 100644 index 5de61ff7755b4..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png deleted file mode 100644 index 5de61ff7755b4..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png deleted file mode 100644 index 4422a35b383a3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png deleted file mode 100644 index 4422a35b383a3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 48d765a83c2c5..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png deleted file mode 100644 index 48d765a83c2c5..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png deleted file mode 100644 index e8f8b62229666..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png deleted file mode 100644 index e8f8b62229666..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png deleted file mode 100644 index 0ae6d64f1ad1a..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png deleted file mode 100644 index 0ae6d64f1ad1a..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png deleted file mode 100644 index 38bd638c1177b..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png b/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png deleted file mode 100644 index 5bfe5ee87a1c1..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/render_conic_2.png b/lib/web_ui/test/golden_files/engine/render_conic_2.png deleted file mode 100644 index b29dcaf7de3b6..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/render_conic_2.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png b/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png deleted file mode 100644 index 8ff94ced85708..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_1.png b/lib/web_ui/test/golden_files/engine/svg_arc_1.png deleted file mode 100644 index 1ff4e3548462c..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_1.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_2.png b/lib/web_ui/test/golden_files/engine/svg_arc_2.png deleted file mode 100644 index 1a85983ace0a3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_2.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_3.png b/lib/web_ui/test/golden_files/engine/svg_arc_3.png deleted file mode 100644 index 82b52a8e94922..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_3.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_4.png b/lib/web_ui/test/golden_files/engine/svg_arc_4.png deleted file mode 100644 index 985ffab0356b9..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_4.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_5.png b/lib/web_ui/test/golden_files/engine/svg_arc_5.png deleted file mode 100644 index 8ea3b1aecd1f8..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_5.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_6.png b/lib/web_ui/test/golden_files/engine/svg_arc_6.png deleted file mode 100644 index d81b3669806e1..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_6.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_7.png b/lib/web_ui/test/golden_files/engine/svg_arc_7.png deleted file mode 100644 index d5755f25a0406..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_7.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_8.png b/lib/web_ui/test/golden_files/engine/svg_arc_8.png deleted file mode 100644 index 5c05e9d2e0eac..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_8.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png b/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png deleted file mode 100644 index f542c87ccd4cb..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_notch.png b/lib/web_ui/test/golden_files/engine/svg_notch.png deleted file mode 100644 index ae349ea613818..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_notch.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png b/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png deleted file mode 100644 index 96c2968b9d38e..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_rect.png b/lib/web_ui/test/golden_files/engine/svg_rect.png deleted file mode 100644 index ab11db65cc76f..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_rect.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/svg_stroke_line.png b/lib/web_ui/test/golden_files/engine/svg_stroke_line.png deleted file mode 100644 index 442e424dd53b3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/svg_stroke_line.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index d95233f0dacab..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png deleted file mode 100644 index d95233f0dacab..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png deleted file mode 100644 index d95233f0dacab..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png deleted file mode 100644 index d95233f0dacab..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index 3b8d47fdb9cde..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png deleted file mode 100644 index 5ade579f73c19..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png deleted file mode 100644 index 69f12679b58ec..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png deleted file mode 100644 index 69f12679b58ec..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index a73483c792e0c..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png deleted file mode 100644 index f1dab492eaac3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png deleted file mode 100644 index f1dab492eaac3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png deleted file mode 100644 index f1dab492eaac3..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png deleted file mode 100644 index fef28b40ffa5d..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png deleted file mode 100644 index 307f89bfcf368..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png deleted file mode 100644 index 307f89bfcf368..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png deleted file mode 100644 index 307f89bfcf368..0000000000000 Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png and /dev/null differ diff --git a/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart index 8d51d677599eb..78e2ddd50808d 100644 --- a/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart @@ -42,7 +42,7 @@ void main() async { } html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/canvas_rrect_round_square.png', region: region); + await matchGoldenFile('canvas_rrect_round_square.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('round rect with big radius scale down smaller radius', () async { @@ -58,7 +58,7 @@ void main() async { } html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/canvas_rrect_overlapping_radius.png', region: region); + await matchGoldenFile('canvas_rrect_overlapping_radius.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('diff round rect with big radius scale down smaller radius', () async { @@ -81,6 +81,6 @@ void main() async { } html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/canvas_drrect_overlapping_radius.png', region: region); + await matchGoldenFile('canvas_drrect_overlapping_radius.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); } diff --git a/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart index 8fbddf0553ad2..4c7986e2bbe71 100644 --- a/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart @@ -68,7 +68,7 @@ void main() async { html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/misaligned_pixels_in_canvas_test.png', region: region); + await matchGoldenFile('misaligned_pixels_in_canvas_test.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('compensates for misalignment of the canvas', () async { @@ -83,7 +83,7 @@ void main() async { html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/misaligned_canvas_test.png', region: region); + await matchGoldenFile('misaligned_canvas_test.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('fill the whole canvas with color even when transformed', () async { @@ -94,7 +94,7 @@ void main() async { html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/bitmap_canvas_fills_color_when_transformed.png', region: region); + await matchGoldenFile('bitmap_canvas_fills_color_when_transformed.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('fill the whole canvas with paint even when transformed', () async { @@ -107,6 +107,6 @@ void main() async { html.document.body.append(canvas.rootElement); - await matchGoldenFile('engine/bitmap_canvas_fills_paint_when_transformed.png', region: region); + await matchGoldenFile('bitmap_canvas_fills_paint_when_transformed.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); } diff --git a/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart index 148660ff78e78..caed73a7f8cfc 100644 --- a/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart @@ -34,7 +34,7 @@ void main() async { html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_shifted_clip_rect.png', region: region); + await matchGoldenFile('compositing_shifted_clip_rect.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('pushClipRect with offset and transform', () async { @@ -54,7 +54,7 @@ void main() async { html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_clip_rect_with_offset_and_transform.png', region: region); + await matchGoldenFile('compositing_clip_rect_with_offset_and_transform.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('pushClipRRect', () async { @@ -67,7 +67,7 @@ void main() async { html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_shifted_clip_rrect.png', region: region); + await matchGoldenFile('compositing_shifted_clip_rrect.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); test('pushPhysicalShape', () async { @@ -95,7 +95,7 @@ void main() async { html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_shifted_physical_shape_clip.png', region: region); + await matchGoldenFile('compositing_shifted_physical_shape_clip.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); group('Cull rect computation', () { @@ -222,7 +222,7 @@ void _testCullRectComputation() { builder.pop(); // pushClipRect html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_cull_rect_fills_layer_clip.png', region: region); + await matchGoldenFile('compositing_cull_rect_fills_layer_clip.png', region: region); final PersistedStandardPicture picture = enumeratePictures().single; expect(picture.optimalLocalCullRect, const Rect.fromLTRB(40, 40, 70, 70)); @@ -250,7 +250,7 @@ void _testCullRectComputation() { builder.pop(); // pushClipRect html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png', region: region); + await matchGoldenFile('compositing_cull_rect_intersects_clip_and_paint_bounds.png', region: region); final PersistedStandardPicture picture = enumeratePictures().single; expect(picture.optimalLocalCullRect, const Rect.fromLTRB(50, 40, 70, 70)); @@ -280,7 +280,7 @@ void _testCullRectComputation() { builder.pop(); // pushClipRect html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_cull_rect_offset_inside_layer_clip.png', region: region); + await matchGoldenFile('compositing_cull_rect_offset_inside_layer_clip.png', region: region); final PersistedStandardPicture picture = enumeratePictures().single; expect(picture.optimalLocalCullRect, @@ -353,7 +353,7 @@ void _testCullRectComputation() { builder.pop(); // pushOffset html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_cull_rect_rotated.png', region: region); + await matchGoldenFile('compositing_cull_rect_rotated.png', region: region); final PersistedStandardPicture picture = enumeratePictures().single; expect( @@ -375,7 +375,7 @@ void _testCullRectComputation() { html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_clip_path.png', region: region); + await matchGoldenFile('compositing_clip_path.png', region: region); }, timeout: const Timeout(Duration(seconds: 10))); // Draw a picture inside a rotated clip. Verify that the cull rect is big @@ -477,7 +477,7 @@ void _testCullRectComputation() { builder.pop(); // pushTransform scale html.document.body.append(builder.build().webOnlyRootElement); - await matchGoldenFile('engine/compositing_3d_rotate1.png', region: region); + await matchGoldenFile('compositing_3d_rotate1.png', region: region); final PersistedStandardPicture picture = enumeratePictures().single; // TODO(https://github.com/flutter/flutter/issues/40395): diff --git a/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart index 3a27a3d0dbea9..452b32acffdb8 100644 --- a/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart @@ -33,7 +33,7 @@ void main() async { html.document.body.append(bitmapCanvas.rootElement); canvas.apply(bitmapCanvas); - await matchGoldenFile('engine/$scubaFileName.png', region: region); + await matchGoldenFile('$scubaFileName.png', region: region); bitmapCanvas.rootElement.remove(); } diff --git a/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart index 7abe5ca0c3610..590cc8fe3ab9d 100644 --- a/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart @@ -38,7 +38,7 @@ void main() async { canvas.apply(bitmapCanvas); - await matchGoldenFile('engine/$scubaFileName.png', region: region); + await matchGoldenFile('$scubaFileName.png', region: region); bitmapCanvas.rootElement.remove(); svgElement.remove(); diff --git a/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart index d439ed70ee2de..b529acadc6078 100644 --- a/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart +++ b/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart @@ -44,7 +44,7 @@ void main() async { try { sceneElement.append(engineCanvas.rootElement); html.document.body.append(sceneElement); - await matchGoldenFile('engine/paint_bounds_for_$fileName.png', region: region); + await matchGoldenFile('paint_bounds_for_$fileName.png', region: region); } finally { // The page is reused across tests, so remove the element after taking the // Scuba screenshot. diff --git a/lib/web_ui/test/golden_tests/engine/scuba.dart b/lib/web_ui/test/golden_tests/engine/scuba.dart index d54d0925a77ea..598daa11a5c3c 100644 --- a/lib/web_ui/test/golden_tests/engine/scuba.dart +++ b/lib/web_ui/test/golden_tests/engine/scuba.dart @@ -40,7 +40,7 @@ class EngineScubaTester { } Future diffScreenshot(String fileName) async { - await matchGoldenFile('engine/$fileName.png', region: ui.Rect.fromLTWH(0, 0, viewportSize.width, viewportSize.height)); + await matchGoldenFile('$fileName.png', region: ui.Rect.fromLTWH(0, 0, viewportSize.width, viewportSize.height)); } /// Prepares the DOM and inserts all the necessary nodes, then invokes scuba's diff --git a/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart index aef4845c93993..ddfa139452b83 100644 --- a/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart +++ b/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart @@ -11,6 +11,6 @@ import 'package:web_engine_tester/golden_tester.dart'; void main() { test('screenshot test reports failure', () async { html.document.body.innerHtml = 'Text that does not appear on the screenshot!'; - await matchGoldenFile('smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200)); + await matchGoldenFile('__local__/smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200)); }); } diff --git a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart index 98c19d0c072cd..c4366eb4310a7 100644 --- a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart +++ b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart @@ -11,6 +11,6 @@ import 'package:web_engine_tester/golden_tester.dart'; void main() { test('screenshot test reports success', () async { html.document.body.innerHtml = 'Hello world!'; - await matchGoldenFile('smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200)); + await matchGoldenFile('__local__/smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200)); }); }