Move SceneBuilder and Platform View code out of CanvasKit

Fix commits that are a result of bad merge

Trigger rebuild

Unify web renderers

Refactor debug JSON helpers. Make _kickRenderLoop use a while loop

remove unused import

Author: harryterkelsen

dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_grid_hover.dart

@@ -42,7 +42,9 @@ class BenchMouseRegionGridHover extends WidgetRecorder {
   late _Tester _tester;
 
   void handleDataPoint(Duration duration) {
-    profile!.addDataPoint('hitTestDuration', duration, reported: true);
+    if (profile != null) {
+      profile!.addDataPoint('hitTestDuration', duration, reported: true);
+    }
   }
 
   // Use a non-trivial border to force Web to switch painter
@@ -71,6 +73,11 @@ class BenchMouseRegionGridHover extends WidgetRecorder {
     super.frameDidDraw();
   }
 
+  @override
+  Future<void> tearDown() async {
+    await _tester.finished;
+  }
+
   @override
   Widget createWidget() {
     const int rowsCount = 60;
@@ -136,6 +143,8 @@ class _Tester {
   static const Duration hoverDuration = Duration(milliseconds: 20);
 
   bool _stopped = false;
+  final Completer<void> _finished = Completer<void>();
+  Future<void> get finished => _finished.future;
 
   TestGesture get gesture {
     return _gesture ??= TestGesture(
@@ -167,6 +176,7 @@ class _Tester {
       await _hoverTo(const Offset(370, 390), hoverDuration);
       await _hoverTo(const Offset(390, 30), hoverDuration);
     }
+    _finished.complete();
   }
 
   void stop() {

dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_mixed_grid_hover.dart

@@ -58,7 +58,9 @@ class BenchMouseRegionMixedGridHover extends WidgetRecorder {
   late _Tester _tester;
 
   void handleDataPoint(Duration duration) {
-    profile!.addDataPoint('hitTestDuration', duration, reported: true);
+    if (profile != null) {
+      profile!.addDataPoint('hitTestDuration', duration, reported: true);
+    }
   }
 
   // Use a non-trivial border to force Web to switch painter
@@ -87,6 +89,11 @@ class BenchMouseRegionMixedGridHover extends WidgetRecorder {
     super.frameDidDraw();
   }
 
+  @override
+  Future<void> tearDown() async {
+    await _tester.finished;
+  }
+
   @override
   Widget createWidget() {
     const int rowsCount = 60;
@@ -157,6 +164,8 @@ class _Tester {
   static const Duration hoverDuration = Duration(milliseconds: 20);
 
   bool _stopped = false;
+  final Completer<void> _finished = Completer<void>();
+  Future<void> get finished => _finished.future;
 
   TestGesture get gesture {
     return _gesture ??= TestGesture(
@@ -188,6 +197,7 @@ class _Tester {
       await _hoverTo(const Offset(370, 390), hoverDuration);
       await _hoverTo(const Offset(390, 30), hoverDuration);
     }
+    _finished.complete();
   }
 
   void stop() {

engine/src/flutter/lib/web_ui/lib/src/engine.dart

@@ -74,19 +74,18 @@ export 'engine/layer/layer_scene_builder.dart';
 export 'engine/layer/layer_tree.dart';
 export 'engine/layer/layer_visitor.dart';
 export 'engine/layer/n_way_canvas.dart';
-export 'engine/layers.dart';
 export 'engine/lazy_path.dart';
 export 'engine/mouse/context_menu.dart';
 export 'engine/mouse/cursor.dart';
 export 'engine/mouse/prevent_default.dart';
 export 'engine/navigation/history.dart';
 export 'engine/noto_font.dart';
 export 'engine/noto_font_encoding.dart';
+export 'engine/occlusion_map.dart';
 export 'engine/onscreen_logging.dart';
 export 'engine/platform_dispatcher.dart';
 export 'engine/platform_dispatcher/app_lifecycle_state.dart';
 export 'engine/platform_dispatcher/view_focus_binding.dart';
-export 'engine/platform_views.dart';
 export 'engine/platform_views/content_manager.dart';
 export 'engine/platform_views/embedder.dart';
 export 'engine/platform_views/message_handler.dart';
@@ -99,9 +98,6 @@ export 'engine/profiler.dart';
 export 'engine/raw_keyboard.dart';
 export 'engine/renderer.dart';
 export 'engine/safe_browser_api.dart';
-export 'engine/scene_builder.dart';
-export 'engine/scene_painting.dart';
-export 'engine/scene_view.dart';
 export 'engine/semantics/accessibility.dart';
 export 'engine/semantics/alert.dart';
 export 'engine/semantics/checkable.dart';

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

@@ -312,17 +312,6 @@ CkImage scaleImage(SkImage image, int? targetWidth, int? targetHeight) {
   return ckImage;
 }
 
-/// Thrown when the web engine fails to decode an image, either due to a
-/// network issue, corrupted image contents, or missing codec.
-class ImageCodecException implements Exception {
-  ImageCodecException(this._message);
-
-  final String _message;
-
-  @override
-  String toString() => 'ImageCodecException: $_message';
-}
-
 const String _kNetworkImageMessage = 'Failed to load network image.';
 
 /// Instantiates a [ui.Codec] backed by an `SkAnimatedImage` from Skia after

engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart

@@ -7,7 +7,7 @@ import 'dart:typed_data';
 import 'package:ui/src/engine.dart';
 import 'package:ui/ui.dart' as ui;
 
-class CkPictureRecorder implements LayerPictureRecorder, ScenePictureRecorder {
+class CkPictureRecorder implements LayerPictureRecorder {
   SkPictureRecorder? _skRecorder;
   CkCanvas? _recordingCanvas;
 

engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart

@@ -430,71 +430,6 @@ class CanvasKitRenderer extends Renderer {
   ui.ParagraphBuilder createParagraphBuilder(ui.ParagraphStyle style) =>
       isExperimentalWebParagraph ? WebParagraphBuilder(style) : CkParagraphBuilder(style);
 
-  // TODO(harryterkelsen): Merge this logic with the async logic in
-  // [EngineScene], https://github.com/flutter/flutter/issues/142072.
-  @override
-  Future<void> renderScene(ui.Scene scene, EngineFlutterView view) async {
-    assert(
-      rasterizers.containsKey(view.viewId),
-      "Unable to render to a view which hasn't been registered",
-    );
-    final ViewRasterizer rasterizer = rasterizers[view.viewId]!;
-    final RenderQueue renderQueue = rasterizer.queue;
-    final FrameTimingRecorder? recorder = FrameTimingRecorder.frameTimingsEnabled
-        ? FrameTimingRecorder()
-        : null;
-    if (renderQueue.current != null) {
-      // If a scene is already queued up, drop it and queue this one up instead
-      // so that the scene view always displays the most recently requested scene.
-      renderQueue.next?.completer.complete();
-      final Completer<void> completer = Completer<void>();
-      renderQueue.next = (scene: scene, completer: completer, recorder: recorder);
-      return completer.future;
-    }
-    final Completer<void> completer = Completer<void>();
-    renderQueue.current = (scene: scene, completer: completer, recorder: recorder);
-    unawaited(_kickRenderLoop(rasterizer));
-    return completer.future;
-  }
-
-  Future<void> _kickRenderLoop(ViewRasterizer rasterizer) async {
-    final RenderQueue renderQueue = rasterizer.queue;
-    final RenderRequest current = renderQueue.current!;
-    try {
-      await _renderScene(current.scene, rasterizer, current.recorder);
-      current.completer.complete();
-    } catch (error, stackTrace) {
-      current.completer.completeError(error, stackTrace);
-    }
-    renderQueue.current = renderQueue.next;
-    renderQueue.next = null;
-    if (renderQueue.current == null) {
-      return;
-    } else {
-      return _kickRenderLoop(rasterizer);
-    }
-  }
-
-  Future<void> _renderScene(
-    ui.Scene scene,
-    ViewRasterizer rasterizer,
-    FrameTimingRecorder? recorder,
-  ) async {
-    // "Build finish" and "raster start" happen back-to-back because we
-    // render on the same thread, so there's no overhead from hopping to
-    // another thread.
-    //
-    // CanvasKit works differently from the HTML renderer in that in HTML
-    // we update the DOM in SceneBuilder.build, which is these function calls
-    // here are CanvasKit-only.
-    recorder?.recordBuildFinish();
-    recorder?.recordRasterStart();
-
-    await rasterizer.draw((scene as LayerScene).layerTree, null);
-    recorder?.recordRasterFinish();
-    recorder?.submitTimings();
-  }
-
   @override
   void clearFragmentProgramCache() {
     _programs.clear();
@@ -537,5 +472,14 @@ class CanvasKitRenderer extends Renderer {
   );
 
   @override
-  void dumpDebugInfo() {}
+  void dumpDebugInfo() {
+    int i = 0;
+    for (final viewRasterizer in rasterizers.values) {
+      final Map<String, dynamic>? debugJson = viewRasterizer.dumpDebugInfo();
+      if (debugJson != null) {
+        downloadDebugInfo('flutter-scene$i', debugJson);
+        i++;
+      }
+    }
+  }
 }

engine/src/flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart

@@ -52,11 +52,12 @@ abstract class ViewRasterizer {
 
   /// Draws the [layerTree] to the screen for the view associated with this
   /// rasterizer.
-  Future<void> draw(LayerTree layerTree, FrameTimingRecorder? recorder) async {
+  /// Returns true if the frame was drawn, and false if it was skipped.
+  Future<bool> draw(LayerTree layerTree, FrameTimingRecorder? recorder) async {
     final ui.Size frameSize = view.physicalSize;
     if (frameSize.isEmpty) {
       // Available drawing area is empty. Skip drawing.
-      return;
+      return false;
     }
 
     // The [frameSize] may be slightly imprecise if the `devicePixelRatio` isn't
@@ -76,6 +77,7 @@ abstract class ViewRasterizer {
     _lastRenderedLayerTree = layerTree;
 
     await viewEmbedder.submitFrame(recorder);
+    return true;
   }
 
   /// Do some initialization to prepare to draw a frame.

engine/src/flutter/lib/web_ui/lib/src/engine/compositing/rasterizer.dart

@@ -162,9 +162,8 @@ class FrameService {
     // In Flutter terminology "building a frame" consists of "beginning
     // frame" and "drawing frame".
     //
-    // We do not call `recordBuildFinish` from here because
-    // part of the rasterization process, particularly in the HTML
-    // renderer, takes place in the `SceneBuilder.build()`.
+    // We do not call `recordBuildFinish` from here because part of the
+    // rasterization process takes place in `SceneBuilder.build()`.
     FrameTimingRecorder.recordCurrentFrameBuildStart();
 
     // We have to convert high-resolution time to `int` so we can construct

engine/src/flutter/lib/web_ui/lib/src/engine/frame_service.dart

@@ -267,3 +267,14 @@ ui.Image scaleImageIfNeeded(
   image.dispose();
   return finalImage;
 }
+
+/// Thrown when the web engine fails to decode an image, either due to a
+/// network issue, corrupted image contents, or missing codec.
+class ImageCodecException implements Exception {
+  ImageCodecException(this._message);
+
+  final String _message;
+
+  @override
+  String toString() => 'ImageCodecException: $_message';
+}