flutter · renyou · Oct 16, 2020 · Oct 16, 2020
diff --git a/flow/layers/child_scene_layer.cc b/flow/layers/child_scene_layer.cc
@@ -26,10 +26,10 @@ void ChildSceneLayer::Paint(PaintContext& context) const {
   FML_NOTREACHED();
 }
 
-void ChildSceneLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void ChildSceneLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "ChildSceneLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
-  context->UpdateView(layer_id_, offset_, size_, hit_testable_);
+  context.UpdateView(layer_id_, offset_, size_, hit_testable_);
 }
 
 }  // namespace flutter
diff --git a/flow/layers/child_scene_layer.h b/flow/layers/child_scene_layer.h
@@ -26,7 +26,7 @@ class ChildSceneLayer : public Layer {
 
   void Paint(PaintContext& context) const override;
 
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 
  private:
   zx_koid_t layer_id_ = ZX_KOID_INVALID;

diff --git a/flow/layers/clip_path_layer.cc b/flow/layers/clip_path_layer.cc
@@ -41,7 +41,7 @@ void ClipPathLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-void ClipPathLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void ClipPathLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "ClipPathLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
 

diff --git a/flow/layers/clip_path_layer.h b/flow/layers/clip_path_layer.h
@@ -22,7 +22,7 @@ class ClipPathLayer : public ContainerLayer {
   }
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private:

diff --git a/flow/layers/clip_rect_layer.cc b/flow/layers/clip_rect_layer.cc
@@ -36,7 +36,7 @@ void ClipRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-void ClipRectLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void ClipRectLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "ClipRectLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
 

diff --git a/flow/layers/clip_rect_layer.h b/flow/layers/clip_rect_layer.h
@@ -21,7 +21,7 @@ class ClipRectLayer : public ContainerLayer {
   }
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private:

diff --git a/flow/layers/clip_rrect_layer.cc b/flow/layers/clip_rrect_layer.cc
@@ -37,7 +37,7 @@ void ClipRRectLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-void ClipRRectLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void ClipRRectLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "ClipRRectLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
 

diff --git a/flow/layers/clip_rrect_layer.h b/flow/layers/clip_rrect_layer.h
@@ -22,7 +22,7 @@ class ClipRRectLayer : public ContainerLayer {
   }
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private:

diff --git a/flow/layers/container_layer.cc b/flow/layers/container_layer.cc
@@ -98,19 +98,18 @@ void ContainerLayer::CheckForChildLayerBelow(PrerollContext* context) {
   // All ContainerLayers make the check in PrerollChildren.
 }
 
-void ContainerLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void ContainerLayer::UpdateScene(SceneUpdateContext& context) {
   UpdateSceneChildren(context);
 }
 
-void ContainerLayer::UpdateSceneChildren(
-    std::shared_ptr<SceneUpdateContext> context) {
+void ContainerLayer::UpdateSceneChildren(SceneUpdateContext& context) {
   FML_DCHECK(needs_system_composite());
 
   std::optional<SceneUpdateContext::Frame> frame;
   if (child_layer_exists_below_) {
     frame.emplace(
         context, SkRRect::MakeRect(paint_bounds()), SK_ColorTRANSPARENT,
-        SkScalarRoundToInt(context->alphaf() * 255), "flutter::ContainerLayer");
+        SkScalarRoundToInt(context.alphaf() * 255), "flutter::ContainerLayer");
     frame->AddPaintLayer(this);
   }
 

diff --git a/flow/layers/container_layer.h b/flow/layers/container_layer.h
@@ -21,7 +21,7 @@ class ContainerLayer : public Layer {
   void Paint(PaintContext& context) const override;
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
   void CheckForChildLayerBelow(PrerollContext* context) override;
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
   const std::vector<std::shared_ptr<Layer>>& layers() const { return layers_; }
@@ -33,7 +33,7 @@ class ContainerLayer : public Layer {
   void PaintChildren(PaintContext& context) const;
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateSceneChildren(std::shared_ptr<SceneUpdateContext> context);
+  void UpdateSceneChildren(SceneUpdateContext& context);
 #endif
 
   // Try to prepare the raster cache for a given layer.

diff --git a/flow/layers/fuchsia_layer_unittests.cc b/flow/layers/fuchsia_layer_unittests.cc
@@ -261,7 +261,7 @@ struct TestContext {
   std::unique_ptr<MockSessionWrapper> mock_session_wrapper;
 
   // SceneUpdateContext.
-  std::shared_ptr<SceneUpdateContext> scene_update_context;
+  std::unique_ptr<SceneUpdateContext> scene_update_context;
 
   // PrerollContext.
   MutatorsStack unused_stack;
@@ -286,7 +286,7 @@ std::unique_ptr<TestContext> InitTest() {
       std::make_unique<MockSessionWrapper>(std::move(session_ptr));
 
   // Init SceneUpdateContext.
-  context->scene_update_context = std::make_shared<SceneUpdateContext>(
+  context->scene_update_context = std::make_unique<SceneUpdateContext>(
       "fuchsia_layer_unittest", fuchsia::ui::views::ViewToken(),
       scenic::ViewRefPair::New(), *(context->mock_session_wrapper));
 
@@ -410,7 +410,7 @@ TEST_F(FuchsiaLayerTest, DISABLED_PhysicalShapeLayersAndChildSceneLayers) {
 
   // Create another frame to be the "real" root. Required because
   // UpdateScene() traversal expects there to already be a top node.
-  SceneUpdateContext::Frame frame(test_context->scene_update_context,
+  SceneUpdateContext::Frame frame(*(test_context->scene_update_context),
                                   SkRRect::MakeRect(SkRect::MakeWH(100, 100)),
                                   SK_ColorTRANSPARENT, SK_AlphaOPAQUE,
                                   "fuchsia test root");
@@ -555,7 +555,7 @@ TEST_F(FuchsiaLayerTest, DISABLED_PhysicalShapeLayersAndChildSceneLayers) {
 
   // Finally, UpdateScene(). The MockSession will check the emitted commands
   // against the list above.
-  root->UpdateScene(test_context->scene_update_context);
+  root->UpdateScene(*(test_context->scene_update_context));
 
   test_context->mock_session_wrapper->Present();
 
@@ -626,7 +626,7 @@ TEST_F(FuchsiaLayerTest, DISABLED_OpacityAndTransformLayer) {
 
   // Create another frame to be the "real" root. Required because
   // UpdateScene() traversal expects there to already be a top node.
-  SceneUpdateContext::Frame frame(test_context->scene_update_context,
+  SceneUpdateContext::Frame frame(*(test_context->scene_update_context),
                                   SkRRect::MakeRect(SkRect::MakeWH(100, 100)),
                                   SK_ColorTRANSPARENT, SK_AlphaOPAQUE,
                                   "fuchsia test root");
@@ -737,7 +737,7 @@ TEST_F(FuchsiaLayerTest, DISABLED_OpacityAndTransformLayer) {
 
   // Finally, UpdateScene(). The MockSession will check the emitted
   // commands against the list above.
-  root->UpdateScene(test_context->scene_update_context);
+  root->UpdateScene(*(test_context->scene_update_context));
 
   test_context->mock_session_wrapper->Present();
 

diff --git a/flow/layers/layer.cc b/flow/layers/layer.cc
@@ -67,13 +67,13 @@ void Layer::CheckForChildLayerBelow(PrerollContext* context) {
   }
 }
 
-void Layer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void Layer::UpdateScene(SceneUpdateContext& context) {
   FML_DCHECK(needs_system_composite());
   FML_DCHECK(child_layer_exists_below_);
 
   SceneUpdateContext::Frame frame(
       context, SkRRect::MakeRect(paint_bounds()), SK_ColorTRANSPARENT,
-      SkScalarRoundToInt(context->alphaf() * 255), "flutter::Layer");
+      SkScalarRoundToInt(context.alphaf() * 255), "flutter::Layer");
 
   frame.AddPaintLayer(this);
 }

diff --git a/flow/layers/layer.h b/flow/layers/layer.h
@@ -154,7 +154,7 @@ class Layer {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
   // Updates the system composited scene.
-  virtual void UpdateScene(std::shared_ptr<SceneUpdateContext> context);
+  virtual void UpdateScene(SceneUpdateContext& context);
   virtual void CheckForChildLayerBelow(PrerollContext* context);
 #endif
 

diff --git a/flow/layers/layer_tree.cc b/flow/layers/layer_tree.cc
@@ -62,11 +62,11 @@ bool LayerTree::Preroll(CompositorContext::ScopedFrame& frame,
 }
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-void LayerTree::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void LayerTree::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "LayerTree::UpdateScene");
 
   // Reset for a new Scene.
-  context->Reset();
+  context.Reset();
 
   const float inv_dpr = 1.0f / device_pixel_ratio_;
   SceneUpdateContext::Transform transform(context, inv_dpr, inv_dpr, 1.0f);
@@ -82,7 +82,7 @@ void LayerTree::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
   if (root_layer_->needs_painting()) {
     frame.AddPaintLayer(root_layer_.get());
   }
-  context->root_node().AddChild(transform.entity_node());
+  context.root_node().AddChild(transform.entity_node());
 }
 #endif
 

diff --git a/flow/layers/layer_tree.h b/flow/layers/layer_tree.h
@@ -32,7 +32,7 @@ class LayerTree {
                bool ignore_raster_cache = false);
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context);
+  void UpdateScene(SceneUpdateContext& context);
 #endif
 
   void Paint(CompositorContext::ScopedFrame& frame,

diff --git a/flow/layers/opacity_layer.cc b/flow/layers/opacity_layer.cc
@@ -85,11 +85,11 @@ void OpacityLayer::Paint(PaintContext& context) const {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-void OpacityLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
-  float saved_alpha = context->alphaf();
-  context->set_alphaf(context->alphaf() * (alpha_ / 255.f));
+void OpacityLayer::UpdateScene(SceneUpdateContext& context) {
+  float saved_alpha = context.alphaf();
+  context.set_alphaf(context.alphaf() * (alpha_ / 255.f));
   ContainerLayer::UpdateScene(context);
-  context->set_alphaf(saved_alpha);
+  context.set_alphaf(saved_alpha);
 }
 
 #endif

diff --git a/flow/layers/opacity_layer.h b/flow/layers/opacity_layer.h
@@ -32,7 +32,7 @@ class OpacityLayer : public MergedContainerLayer {
   void Paint(PaintContext& context) const override;
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private:

diff --git a/flow/layers/platform_view_layer.cc b/flow/layers/platform_view_layer.cc
@@ -47,11 +47,10 @@ void PlatformViewLayer::Paint(PaintContext& context) const {
 }
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-void PlatformViewLayer::UpdateScene(
-    std::shared_ptr<SceneUpdateContext> context) {
+void PlatformViewLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "PlatformViewLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
-  context->UpdateView(view_id_, offset_, size_);
+  context.UpdateView(view_id_, offset_, size_);
 }
 #endif
 

diff --git a/flow/layers/platform_view_layer.h b/flow/layers/platform_view_layer.h
@@ -19,7 +19,7 @@ class PlatformViewLayer : public Layer {
   void Paint(PaintContext& context) const override;
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
   // Updates the system composited scene.
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private:

diff --git a/flow/layers/transform_layer.cc b/flow/layers/transform_layer.cc
@@ -54,7 +54,7 @@ void TransformLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-void TransformLayer::UpdateScene(std::shared_ptr<SceneUpdateContext> context) {
+void TransformLayer::UpdateScene(SceneUpdateContext& context) {
   TRACE_EVENT0("flutter", "TransformLayer::UpdateScene");
   FML_DCHECK(needs_system_composite());
 

diff --git a/flow/layers/transform_layer.h b/flow/layers/transform_layer.h
@@ -20,7 +20,7 @@ class TransformLayer : public ContainerLayer {
   void Paint(PaintContext& context) const override;
 
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateScene(std::shared_ptr<SceneUpdateContext> context) override;
+  void UpdateScene(SceneUpdateContext& context) override;
 #endif
 
  private: