Impl

dkwingsmt · dkwingsmt · commit fce69d0f7346 · 2022-09-27T21:01:27.000-07:00
Format

view -&gt; surface
diff --git a/flow/embedded_views.cc b/flow/embedded_views.cc
@@ -70,6 +70,7 @@ void DisplayListEmbedderViewSlice::render_into(DisplayListBuilder* builder) {
 }
 
 void ExternalViewEmbedder::SubmitFrame(GrDirectContext* context,
+                                       uint64_t frame_view_id,
                                        std::unique_ptr<SurfaceFrame> frame) {
   frame->Submit();
 };
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
@@ -405,6 +405,7 @@ class ExternalViewEmbedder {
   //
   // It can also allocate frames for overlay surfaces to compose hybrid views.
   virtual void SubmitFrame(GrDirectContext* context,
+                           uint64_t frame_view_id,
                            std::unique_ptr<SurfaceFrame> frame);
 
   // This method provides the embedder a way to do additional tasks after
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -488,6 +488,9 @@ RasterStatus Rasterizer::DrawToSurface(
 RasterStatus Rasterizer::DrawToSurfaceUnsafe(
     FrameTimingsRecorder& frame_timings_recorder,
     flutter::LayerTree& layer_tree) {
+  // Always gets the first surface, #0. After Flutter supports multi-view, it
+  // should get the surface ID from layer_tree.
+  uint64_t surface_id = 0;
   FML_DCHECK(surface_);
 
   compositor_context_->ui_time().SetLapTime(
@@ -594,7 +597,7 @@ RasterStatus Rasterizer::DrawToSurfaceUnsafe(
     if (external_view_embedder_ &&
         (!raster_thread_merger_ || raster_thread_merger_->IsMerged())) {
       FML_DCHECK(!frame->IsSubmitted());
-      external_view_embedder_->SubmitFrame(surface_->GetContext(),
+      external_view_embedder_->SubmitFrame(surface_->GetContext(), surface_id,
                                            std::move(frame));
     } else {
       frame->Submit();
diff --git a/shell/common/rasterizer_unittests.cc b/shell/common/rasterizer_unittests.cc
@@ -69,8 +69,9 @@ class MockExternalViewEmbedder : public ExternalViewEmbedder {
   MOCK_METHOD0(GetCurrentCanvases, std::vector<SkCanvas*>());
   MOCK_METHOD0(GetCurrentBuilders, std::vector<DisplayListBuilder*>());
   MOCK_METHOD1(CompositeEmbeddedView, EmbedderPaintContext(int view_id));
-  MOCK_METHOD2(SubmitFrame,
+  MOCK_METHOD3(SubmitFrame,
                void(GrDirectContext* context,
+                    uint64_t frame_view_id,
                     std::unique_ptr<SurfaceFrame> frame));
   MOCK_METHOD2(EndFrame,
                void(bool should_resubmit_frame,
diff --git a/shell/common/shell_test_external_view_embedder.cc b/shell/common/shell_test_external_view_embedder.cc
@@ -106,6 +106,7 @@ EmbedderPaintContext ShellTestExternalViewEmbedder::CompositeEmbeddedView(
 // |ExternalViewEmbedder|
 void ShellTestExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
+    uint64_t frame_view_id,
     std::unique_ptr<SurfaceFrame> frame) {
   if (!frame) {
     return;
diff --git a/shell/common/shell_test_external_view_embedder.h b/shell/common/shell_test_external_view_embedder.h
@@ -80,6 +80,7 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void SubmitFrame(GrDirectContext* context,
+                   uint64_t frame_view_id,
                    std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.cc b/shell/platform/android/external_view_embedder/external_view_embedder.cc
@@ -99,6 +99,7 @@ SkRect AndroidExternalViewEmbedder::GetViewRect(int view_id) const {
 // |ExternalViewEmbedder|
 void AndroidExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
+    uint64_t frame_view_id,
     std::unique_ptr<SurfaceFrame> frame) {
   TRACE_EVENT0("flutter", "AndroidExternalViewEmbedder::SubmitFrame");
 
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder.h b/shell/platform/android/external_view_embedder/external_view_embedder.h
@@ -55,6 +55,7 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
 
   // |ExternalViewEmbedder|
   void SubmitFrame(GrDirectContext* context,
+                   uint64_t frame_view_id,
                    std::unique_ptr<SurfaceFrame> frame) override;
 
   // |ExternalViewEmbedder|
diff --git a/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc b/shell/platform/android/external_view_embedder/external_view_embedder_unittests.cc
@@ -371,7 +371,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
     // Submits frame if no Android view in the current frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -439,7 +439,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
         },
         /*frame_size=*/SkISize::Make(800, 600));
 
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
     // Doesn't submit frame if there aren't Android views in the previous frame.
     EXPECT_FALSE(did_submit_frame);
     // Resubmits frame.
@@ -504,7 +504,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrame) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
     // Submits frame if there are Android views in the previous frame.
     EXPECT_TRUE(did_submit_frame);
     // Doesn't resubmit frame.
@@ -614,7 +614,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFrameOverlayComposition) {
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -683,7 +683,7 @@ TEST(AndroidExternalViewEmbedder, SubmitFramePlatformViewWithoutAnyOverlay) {
       },
       /*frame_size=*/SkISize::Make(800, 600));
 
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
 
   EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -785,7 +785,7 @@ TEST(AndroidExternalViewEmbedder, DestroyOverlayLayersOnSizeChange) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -873,7 +873,7 @@ TEST(AndroidExternalViewEmbedder, DoesNotDestroyOverlayLayersOnSizeChange) {
           return true;
         },
         /*frame_size=*/SkISize::Make(800, 600));
-    embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+    embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
 
     EXPECT_CALL(*jni_mock, FlutterViewEndFrame());
     embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
@@ -985,7 +985,7 @@ TEST(AndroidExternalViewEmbedder, Teardown) {
       SkSurface::MakeNull(1000, 1000), framebuffer_info,
       [](const SurfaceFrame& surface_frame, SkCanvas* canvas) { return true; },
       /*frame_size=*/SkISize::Make(800, 600));
-  embedder->SubmitFrame(gr_context.get(), std::move(surface_frame));
+  embedder->SubmitFrame(gr_context.get(), 0, std::move(surface_frame));
 
   embedder->EndFrame(/*should_resubmit_frame=*/false, raster_thread_merger);
 
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.h
@@ -19,7 +19,7 @@ namespace flutter {
 // Platform views are not yet supported.
 class FlutterCompositor {
  public:
-  using GetViewCallback = std::function<FlutterView*(uint64_t view_id)>;
+  using GetViewCallback = std::function<FlutterView*(uint64_t surface_id)>;
 
   explicit FlutterCompositor(GetViewCallback get_view_callback);
 
@@ -46,7 +46,9 @@ class FlutterCompositor {
   // Presents the FlutterLayers by updating FlutterView(s) using the
   // layer content.
   // Present sets frame_started_ to false.
-  virtual bool Present(const FlutterLayer** layers, size_t layers_count) = 0;
+  virtual bool Present(uint64_t surface_id,
+                       const FlutterLayer** layers,
+                       size_t layers_count) = 0;
 
   using PresentCallback = std::function<bool(bool has_flutter_content)>;
 
@@ -64,7 +66,7 @@ class FlutterCompositor {
   typedef enum { kStarted, kPresenting, kEnded } FrameStatus;
 
  protected:
-  FlutterView* GetView(uint64_t view_id);
+  FlutterView* GetView(uint64_t surface_id);
 
   // Gets and sets the FrameStatus for the current frame.
   void SetFrameStatus(FrameStatus frame_status);
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm b/shell/platform/darwin/macos/framework/Source/FlutterCompositor.mm
@@ -33,8 +33,8 @@
   return status;
 }
 
-FlutterView* FlutterCompositor::GetView(uint64_t view_id) {
-  return get_view_callback_(view_id);
+FlutterView* FlutterCompositor::GetView(uint64_t surface_id) {
+  return get_view_callback_(surface_id);
 }
 
 void FlutterCompositor::SetFrameStatus(FlutterCompositor::FrameStatus frame_status) {
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm b/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
@@ -434,7 +434,7 @@ - (FlutterCompositor*)createFlutterCompositor {
 
   __weak FlutterEngine* weakSelf = self;
 
-  flutter::FlutterCompositor::GetViewCallback getViewCallback = [weakSelf](uint64_t view_id) {
+  flutter::FlutterCompositor::GetViewCallback getViewCallback = [weakSelf](uint64_t surface_id) {
     return weakSelf.viewController == nullptr ? nullptr : weakSelf.viewController.flutterView;
   };
 
@@ -489,11 +489,13 @@ - (FlutterCompositor*)createFlutterCompositor {
         backing_store);
   };
 
-  _compositor.present_layers_callback = [](const FlutterLayer** layers,  //
-                                           size_t layers_count,          //
-                                           void* user_data               //
-                                        ) {
-    return reinterpret_cast<flutter::FlutterCompositor*>(user_data)->Present(layers, layers_count);
+  _compositor.present_layers_surface_callback = [](uint64_t surface_id,          //
+                                                   const FlutterLayer** layers,  //
+                                                   size_t layers_count,          //
+                                                   void* user_data               //
+                                                ) {
+    return reinterpret_cast<flutter::FlutterCompositor*>(user_data)->Present(surface_id, layers,
+                                                                             layers_count);
   };
 
   _compositor.avoid_backing_store_cache = true;
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.h b/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.h
@@ -44,7 +44,9 @@ class FlutterGLCompositor : public FlutterCompositor {
   // Presents the FlutterLayers by updating FlutterView(s) using the
   // layer content.
   // Present sets frame_started_ to false.
-  bool Present(const FlutterLayer** layers, size_t layers_count) override;
+  bool Present(uint64_t surface_id,
+               const FlutterLayer** layers,
+               size_t layers_count) override;
 
  private:
   const NSOpenGLContext* open_gl_context_;
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm b/shell/platform/darwin/macos/framework/Source/FlutterGLCompositor.mm
@@ -25,9 +25,7 @@
 
 bool FlutterGLCompositor::CreateBackingStore(const FlutterBackingStoreConfig* config,
                                              FlutterBackingStore* backing_store_out) {
-  // Always gets the first view, #0. After Flutter supports multi-view, it
-  // should get the view ID from somewhere.
-  FlutterView* view = GetView(0);
+  FlutterView* view = GetView(config->surface_id);
   if (!view) {
     return false;
   }
@@ -76,7 +74,9 @@
   return true;
 }
 
-bool FlutterGLCompositor::Present(const FlutterLayer** layers, size_t layers_count) {
+bool FlutterGLCompositor::Present(uint64_t surface_id,
+                                  const FlutterLayer** layers,
+                                  size_t layers_count) {
   // Always gets the first view, #0. After Flutter supports multi-view, it
   // should get the view ID from somewhere.
   FlutterView* view = GetView(0);
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterGLCompositorUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterGLCompositorUnittests.mm
@@ -26,7 +26,7 @@
     return true;
   });
 
-  ASSERT_TRUE(macos_compositor->Present(nil, 0));
+  ASSERT_TRUE(macos_compositor->Present(0, nil, 0));
   ASSERT_TRUE(flag);
 }
 
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.h b/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.h
@@ -42,7 +42,9 @@ class FlutterMetalCompositor : public FlutterCompositor {
 
   // Composites the provided FlutterLayer objects and presents the composited
   // frame to the FlutterView(s).
-  bool Present(const FlutterLayer** layers, size_t layers_count) override;
+  bool Present(uint64_t surface_id,
+               const FlutterLayer** layers,
+               size_t layers_count) override;
 
  private:
   // Presents the platform view layer represented by `layer`. `layer_index` is
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.mm b/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositor.mm
@@ -20,9 +20,7 @@
 
 bool FlutterMetalCompositor::CreateBackingStore(const FlutterBackingStoreConfig* config,
                                                 FlutterBackingStore* backing_store_out) {
-  // Always gets the first view, #0. After Flutter supports multi-view, it
-  // should get the view ID from somewhere.
-  FlutterView* view = GetView(0);
+  FlutterView* view = GetView(config->surface_id);
   if (!view) {
     return false;
   }
@@ -79,10 +77,10 @@
   return true;
 }
 
-bool FlutterMetalCompositor::Present(const FlutterLayer** layers, size_t layers_count) {
-  // Always gets the first view, #0. After Flutter supports multi-view, it
-  // should get the view ID from somewhere.
-  FlutterView* view = GetView(0);
+bool FlutterMetalCompositor::Present(uint64_t surface_id,
+                                     const FlutterLayer** layers,
+                                     size_t layers_count) {
+  FlutterView* view = GetView(surface_id);
   if (!view) {
     return false;
   }
diff --git a/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositorUnittests.mm b/shell/platform/darwin/macos/framework/Source/FlutterMetalCompositorUnittests.mm
@@ -41,7 +41,7 @@
     return true;
   });
 
-  ASSERT_TRUE(macos_compositor->Present(nil, 0));
+  ASSERT_TRUE(macos_compositor->Present(0, nil, 0));
   ASSERT_TRUE(flag);
 }
 
diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
@@ -1034,7 +1034,7 @@ InferExternalViewEmbedderFromArgs(const FlutterCompositor* compositor) {
   auto c_collect_callback =
       SAFE_ACCESS(compositor, collect_backing_store_callback, nullptr);
   auto c_present_callback =
-      SAFE_ACCESS(compositor, present_layers_callback, nullptr);
+      SAFE_ACCESS(compositor, present_layers_surface_callback, nullptr);
   bool avoid_backing_store_cache =
       SAFE_ACCESS(compositor, avoid_backing_store_cache, false);
 
@@ -1054,12 +1054,12 @@ InferExternalViewEmbedderFromArgs(const FlutterCompositor* compositor) {
           };
 
   flutter::EmbedderExternalViewEmbedder::PresentCallback present_callback =
-      [c_present_callback,
-       user_data = compositor->user_data](const auto& layers) {
+      [c_present_callback, user_data = compositor->user_data](
+          uint64_t surface_id, const auto& layers) {
         TRACE_EVENT0("flutter", "FlutterCompositorPresentLayers");
         return c_present_callback(
-            const_cast<const FlutterLayer**>(layers.data()), layers.size(),
-            user_data);
+            surface_id, const_cast<const FlutterLayer**>(layers.data()),
+            layers.size(), user_data);
       };
 
   return {std::make_unique<flutter::EmbedderExternalViewEmbedder>(
diff --git a/shell/platform/embedder/embedder.h b/shell/platform/embedder/embedder.h
@@ -1371,6 +1371,8 @@ typedef struct {
   size_t struct_size;
   /// The size of the render target the engine expects to render into.
   FlutterSize size;
+  /// Indicates the view that owns the layer this store is backing.
+  uint64_t surface_id;
 } FlutterBackingStoreConfig;
 
 typedef enum {
@@ -1414,14 +1416,18 @@ typedef bool (*FlutterBackingStoreCollectCallback)(
 typedef bool (*FlutterLayersPresentCallback)(const FlutterLayer** layers,
                                              size_t layers_count,
                                              void* user_data);
+typedef bool (*FlutterLayersPresentSurfaceCallback)(uint64_t surface_id,
+                                                    const FlutterLayer** layers,
+                                                    size_t layers_count,
+                                                    void* user_data);
 
 typedef struct {
   /// This size of this struct. Must be sizeof(FlutterCompositor).
   size_t struct_size;
   /// A baton that in not interpreted by the engine in any way. If it passed
   /// back to the embedder in `FlutterCompositor.create_backing_store_callback`,
   /// `FlutterCompositor.collect_backing_store_callback` and
-  /// `FlutterCompositor.present_layers_callback`
+  /// `FlutterCompositor.present_layers_surface_callback`
   void* user_data;
   /// A callback invoked by the engine to obtain a backing store for a specific
   /// `FlutterLayer`.
@@ -1434,11 +1440,13 @@ typedef struct {
   /// A callback invoked by the engine to release the backing store. The
   /// embedder may collect any resources associated with the backing store.
   FlutterBackingStoreCollectCallback collect_backing_store_callback;
-  /// Callback invoked by the engine to composite the contents of each layer
-  /// onto the screen.
-  FlutterLayersPresentCallback present_layers_callback;
+  /// A deprecated callback. It is not used and should not be set.
+  void* _deprecated_present_layers_callback;
   /// Avoid caching backing stores provided by this compositor.
   bool avoid_backing_store_cache;
+  /// Callback invoked by the engine to composite the contents of each layer
+  /// onto the screen.
+  FlutterLayersPresentSurfaceCallback present_layers_surface_callback;
 } FlutterCompositor;
 
 typedef struct {
diff --git a/shell/platform/embedder/embedder_external_view_embedder.cc b/shell/platform/embedder/embedder_external_view_embedder.cc
diff --git a/shell/platform/embedder/embedder_external_view_embedder.h b/shell/platform/embedder/embedder_external_view_embedder.h
diff --git a/shell/platform/embedder/embedder_layers.cc b/shell/platform/embedder/embedder_layers.cc
diff --git a/shell/platform/embedder/embedder_layers.h b/shell/platform/embedder/embedder_layers.h
diff --git a/shell/platform/embedder/tests/embedder_config_builder.cc b/shell/platform/embedder/tests/embedder_config_builder.cc
diff --git a/shell/platform/embedder/tests/embedder_test_compositor.cc b/shell/platform/embedder/tests/embedder_test_compositor.cc
diff --git a/shell/platform/embedder/tests/embedder_test_compositor.h b/shell/platform/embedder/tests/embedder_test_compositor.h
diff --git a/shell/platform/embedder/tests/embedder_unittests_gl.cc b/shell/platform/embedder/tests/embedder_unittests_gl.cc

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ void DisplayListEmbedderViewSlice::render_into(DisplayListBuilder* builder) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`void ExternalViewEmbedder::SubmitFrame(GrDirectContext* context,`
	`73`	`+ uint64_t frame_view_id,`
`73`	`74`	`std::unique_ptr<SurfaceFrame> frame) {`
`74`	`75`	`frame->Submit();`
`75`	`76`	`};`