fuchsia: Remove dead code / break dependencies

The fuchsia code around metrics and sizing was just sending this
information through a side-channel, when the engine already had the
information available.  So, delete all of it to make future CLs simpler.

Additionally, the SceneUpdateContext has many unneccesary dependencies
re: metrics and PaintTasks.  Break those to make future CLs simpler.

Tested: Ran all unittests and ran workstation on Fuchsia
BUG: 53062, 53063

Author: arbreng

flow/compositor_context.cc

@@ -5,6 +5,7 @@
 #include "flutter/flow/compositor_context.h"
 
 #include "flutter/flow/layers/layer_tree.h"
+#include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 
 namespace flutter {

flow/gl_context_switch.cc

@@ -4,6 +4,8 @@
 
 #include "flutter/flow/gl_context_switch.h"
 
+#include "flutter/fml/logging.h"
+
 namespace flutter {
 
 SwitchableGLContext::SwitchableGLContext() = default;

flow/gl_context_switch.h

@@ -9,7 +9,6 @@
 #include <memory>
 #include <vector>
 
-#include "flutter/fml/logging.h"
 #include "flutter/fml/macros.h"
 
 namespace flutter {

flow/layers/backdrop_filter_layer.cc

@@ -4,6 +4,9 @@
 
 #include "flutter/flow/layers/backdrop_filter_layer.h"
 
+#include "flutter/fml/logging.h"
+#include "flutter/fml/trace_event.h"
+
 namespace flutter {
 
 BackdropFilterLayer::BackdropFilterLayer(sk_sp<SkImageFilter> filter)

flow/layers/backdrop_filter_layer.h

@@ -6,7 +6,7 @@
 #define FLUTTER_FLOW_LAYERS_BACKDROP_FILTER_LAYER_H_
 
 #include "flutter/flow/layers/container_layer.h"
-
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 
 namespace flutter {

flow/layers/backdrop_filter_layer_unittests.cc

@@ -23,7 +23,6 @@ TEST_F(BackdropFilterLayerTest, PaintingEmptyLayerDies) {
   layer->Preroll(preroll_context(), SkMatrix());
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_FALSE(layer->needs_painting());
-  EXPECT_FALSE(layer->needs_system_composite());
 
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
                             "needs_painting\\(\\)");
@@ -206,7 +205,7 @@ TEST_F(BackdropFilterLayerTest, Readback) {
 
   // BDF with no filter blocks child with readback
   auto mock_layer =
-      std::make_shared<MockLayer>(SkPath(), SkPaint(), false, false, true);
+      std::make_shared<MockLayer>(SkPath(), SkPaint(), false, true);
   layer2->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
   layer2->Preroll(preroll_context(), initial_transform);

flow/layers/child_scene_layer.cc

@@ -5,6 +5,7 @@
 #include "flutter/flow/layers/child_scene_layer.h"
 
 #include "flutter/flow/view_holder.h"
+#include "flutter/fml/trace_event.h"
 
 namespace flutter {
 
@@ -19,16 +20,21 @@ ChildSceneLayer::ChildSceneLayer(zx_koid_t layer_id,
 
 void ChildSceneLayer::Preroll(PrerollContext* context, const SkMatrix& matrix) {
   TRACE_EVENT0("flutter", "ChildSceneLayer::Preroll");
-  set_needs_system_composite(true);
 
+  context->has_platform_view = true;
+  context->platform_view_exists_below = true;
   CheckForChildLayerBelow(context);
 
-  context->child_scene_layer_exists_below = true;
-
   // An alpha "hole punch" is required if the frame behind us is not opaque.
-  if (!context->is_opaque) {
-    set_paint_bounds(
-        SkRect::MakeXYWH(offset_.fX, offset_.fY, size_.fWidth, size_.fHeight));
+  for (auto i = context->mutators_stack.Bottom();
+       i != context->mutators_stack.Top(); ++i) {
+    const auto& mutator = *i;
+    if (mutator->GetType() == MutatorType::opacity &&
+        mutator->GetAlpha() < 255) {
+      set_paint_bounds(SkRect::MakeXYWH(offset_.fX, offset_.fY, size_.fWidth,
+                                        size_.fHeight));
+      break;
+    }
   }
 }
 

flow/layers/child_scene_layer.h

@@ -5,13 +5,12 @@
 #ifndef FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
 #define FLUTTER_FLOW_LAYERS_CHILD_SCENE_LAYER_H_
 
+#include "flutter/flow/layers/layer.h"
+#include "flutter/flow/scene_update_context.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkPoint.h"
 #include "third_party/skia/include/core/SkSize.h"
 
-#include "flutter/flow/layers/layer.h"
-#include "flutter/flow/scene_update_context.h"
-
 namespace flutter {
 
 // Layer that represents an embedded child.

flow/layers/clip_path_layer.cc

@@ -4,9 +4,11 @@
 
 #include "flutter/flow/layers/clip_path_layer.h"
 
+#include "flutter/fml/trace_event.h"
+
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
 
-#include "lib/ui/scenic/cpp/commands.h"
+#include "flutter/flow/scene_update_context.h"  //nogncheck
 
 #endif
 
@@ -48,7 +50,7 @@ void ClipPathLayer::UpdateScene(SceneUpdateContext& context) {
 
   // TODO(liyuqian): respect clip_behavior_
   SceneUpdateContext::Clip clip(context, clip_path_.getBounds());
-  UpdateSceneChildren(context);
+  ContainerLayer::UpdateScene(context);
 }
 
 #endif

flow/layers/clip_path_layer.h

@@ -7,6 +7,9 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
+#include "flutter/fml/macros.h"
+#include "third_party/skia/include/core/SkPath.h"
+
 namespace flutter {
 
 class ClipPathLayer : public ContainerLayer {

flow/layers/clip_path_layer_unittests.cc

@@ -218,7 +218,7 @@ TEST_F(ClipPathLayerTest, Readback) {
   const Clip save_layer = Clip::antiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
-  auto reader = std::make_shared<MockLayer>(path, paint, false, false, true);
+  auto reader = std::make_shared<MockLayer>(path, paint, false, true);
   auto nonreader = std::make_shared<MockLayer>(path, paint);
 
   // No children, no prior readback -> no readback after

flow/layers/clip_rect_layer.cc

@@ -4,6 +4,14 @@
 
 #include "flutter/flow/layers/clip_rect_layer.h"
 
+#include "flutter/fml/trace_event.h"
+
+#if defined(LEGACY_FUCHSIA_EMBEDDER)
+
+#include "flutter/flow/scene_update_context.h"  //nogncheck
+
+#endif
+
 namespace flutter {
 
 ClipRectLayer::ClipRectLayer(const SkRect& clip_rect, Clip clip_behavior)
@@ -41,7 +49,7 @@ void ClipRectLayer::UpdateScene(SceneUpdateContext& context) {
 
   // TODO(liyuqian): respect clip_behavior_
   SceneUpdateContext::Clip clip(context, clip_rect_);
-  UpdateSceneChildren(context);
+  ContainerLayer::UpdateScene(context);
 }
 
 #endif

flow/layers/clip_rect_layer.h

@@ -7,6 +7,9 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
+#include "flutter/fml/macros.h"
+#include "third_party/skia/include/core/SkRect.h"
+
 namespace flutter {
 
 class ClipRectLayer : public ContainerLayer {

flow/layers/clip_rect_layer_unittests.cc

@@ -215,7 +215,7 @@ TEST_F(ClipRectLayerTest, Readback) {
   const Clip save_layer = Clip::antiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
-  auto reader = std::make_shared<MockLayer>(path, paint, false, false, true);
+  auto reader = std::make_shared<MockLayer>(path, paint, false, true);
   auto nonreader = std::make_shared<MockLayer>(path, paint);
 
   // No children, no prior readback -> no readback after

flow/layers/clip_rrect_layer.cc

@@ -4,6 +4,14 @@
 
 #include "flutter/flow/layers/clip_rrect_layer.h"
 
+#include "flutter/fml/trace_event.h"
+
+#if defined(LEGACY_FUCHSIA_EMBEDDER)
+
+#include "flutter/flow/scene_update_context.h"  //nogncheck
+
+#endif
+
 namespace flutter {
 
 ClipRRectLayer::ClipRRectLayer(const SkRRect& clip_rrect, Clip clip_behavior)
@@ -42,7 +50,7 @@ void ClipRRectLayer::UpdateScene(SceneUpdateContext& context) {
 
   // TODO(liyuqian): respect clip_behavior_
   SceneUpdateContext::Clip clip(context, clip_rrect_.getBounds());
-  UpdateSceneChildren(context);
+  ContainerLayer::UpdateScene(context);
 }
 
 #endif

flow/layers/clip_rrect_layer.h

@@ -6,6 +6,8 @@
 #define FLUTTER_FLOW_LAYERS_CLIP_RRECT_LAYER_H_
 
 #include "flutter/flow/layers/container_layer.h"
+#include "flutter/fml/macros.h"
+#include "third_party/skia/include/core/SkRRect.h"
 
 namespace flutter {
 

flow/layers/clip_rrect_layer_unittests.cc

@@ -221,7 +221,7 @@ TEST_F(ClipRRectLayerTest, Readback) {
   const Clip save_layer = Clip::antiAliasWithSaveLayer;
 
   std::shared_ptr<MockLayer> nochild;
-  auto reader = std::make_shared<MockLayer>(path, paint, false, false, true);
+  auto reader = std::make_shared<MockLayer>(path, paint, false, true);
   auto nonreader = std::make_shared<MockLayer>(path, paint);
 
   // No children, no prior readback -> no readback after

flow/layers/color_filter_layer.cc

@@ -4,6 +4,8 @@
 
 #include "flutter/flow/layers/color_filter_layer.h"
 
+#include "flutter/fml/trace_event.h"
+
 namespace flutter {
 
 ColorFilterLayer::ColorFilterLayer(sk_sp<SkColorFilter> filter)

flow/layers/color_filter_layer.h

@@ -6,7 +6,7 @@
 #define FLUTTER_FLOW_LAYERS_COLOR_FILTER_LAYER_H_
 
 #include "flutter/flow/layers/container_layer.h"
-
+#include "flutter/fml/macros.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 
 namespace flutter {

flow/layers/color_filter_layer_unittests.cc

@@ -23,7 +23,6 @@ TEST_F(ColorFilterLayerTest, PaintingEmptyLayerDies) {
   layer->Preroll(preroll_context(), SkMatrix());
   EXPECT_EQ(layer->paint_bounds(), kEmptyRect);
   EXPECT_FALSE(layer->needs_painting());
-  EXPECT_FALSE(layer->needs_system_composite());
 
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
                             "needs_painting\\(\\)");
@@ -207,7 +206,7 @@ TEST_F(ColorFilterLayerTest, Readback) {
 
   // ColorFilterLayer blocks child with readback
   auto mock_layer =
-      std::make_shared<MockLayer>(SkPath(), SkPaint(), false, false, true);
+      std::make_shared<MockLayer>(SkPath(), SkPaint(), false, true);
   layer->Add(mock_layer);
   preroll_context()->surface_needs_readback = false;
   layer->Preroll(preroll_context(), initial_transform);

flow/layers/container_layer.cc

@@ -4,6 +4,14 @@
 
 #include "flutter/flow/layers/container_layer.h"
 
+#include "flutter/fml/trace_event.h"
+
+#if defined(LEGACY_FUCHSIA_EMBEDDER)
+
+#include "flutter/flow/scene_update_context.h"  //nogncheck
+
+#endif
+
 namespace flutter {
 
 ContainerLayer::ContainerLayer() {}
@@ -30,8 +38,8 @@ void ContainerLayer::PrerollChildren(PrerollContext* context,
                                      const SkMatrix& child_matrix,
                                      SkRect* child_paint_bounds) {
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  child_layer_exists_below_ = context->child_scene_layer_exists_below;
-  context->child_scene_layer_exists_below = false;
+  set_platform_view_exists_below(context->platform_view_exists_below);
+  context->platform_view_exists_below = false;
 #endif
 
   // Platform views have no children, so context->has_platform_view should
@@ -46,23 +54,24 @@ void ContainerLayer::PrerollChildren(PrerollContext* context,
 
     layer->Preroll(context, child_matrix);
 
+#if defined(LEGACY_FUCHSIA_EMBEDDER)
     if (layer->needs_system_composite()) {
       set_needs_system_composite(true);
     }
+#endif
     child_paint_bounds->join(layer->paint_bounds());
 
     child_has_platform_view =
         child_has_platform_view || context->has_platform_view;
   }
 
   context->has_platform_view = child_has_platform_view;
-
 #if defined(LEGACY_FUCHSIA_EMBEDDER)
-  if (child_layer_exists_below_) {
+  if (platform_view_exists_below()) {
     set_needs_system_composite(true);
   }
-  context->child_scene_layer_exists_below =
-      context->child_scene_layer_exists_below || child_layer_exists_below_;
+  context->platform_view_exists_below =
+      context->platform_view_exists_below || platform_view_exists_below();
 #endif
 }
 
@@ -94,10 +103,6 @@ void ContainerLayer::CheckForChildLayerBelow(PrerollContext* context) {
 }
 
 void ContainerLayer::UpdateScene(SceneUpdateContext& context) {
-  UpdateSceneChildren(context);
-}
-
-void ContainerLayer::UpdateSceneChildren(SceneUpdateContext& context) {
   auto update_scene_layers = [&] {
     // Paint all of the layers which need to be drawn into the container.
     // These may be flattened down to a containing Scenic Frame.
@@ -113,7 +118,7 @@ void ContainerLayer::UpdateSceneChildren(SceneUpdateContext& context) {
   // If there is embedded Fuchsia content in the scene (a ChildSceneLayer),
   // PhysicalShapeLayers that appear above the embedded content will be turned
   // into their own Scenic layers.
-  if (child_layer_exists_below_) {
+  if (platform_view_exists_below()) {
     float global_scenic_elevation =
         context.GetGlobalElevationForNextScenicLayer();
     float local_scenic_elevation =
@@ -146,8 +151,8 @@ void ContainerLayer::UpdateSceneChildren(SceneUpdateContext& context) {
 
     frame.AddPaintLayer(this);
 
-    // Node: UpdateSceneChildren needs to be called here so that |frame| is
-    // still in scope (and therefore alive) while UpdateSceneChildren is being
+    // Node: update_scene_layers needs to be called here so that |frame| is
+    // still in scope (and therefore alive) while update_scene_layers is being
     // called.
     float scenic_elevation = context.scenic_elevation();
     context.set_scenic_elevation(scenic_elevation + local_scenic_elevation);

flow/layers/container_layer.h

@@ -6,7 +6,9 @@
 #define FLUTTER_FLOW_LAYERS_CONTAINER_LAYER_H_
 
 #include <vector>
+
 #include "flutter/flow/layers/layer.h"
+#include "flutter/fml/macros.h"
 
 namespace flutter {
 
@@ -31,10 +33,6 @@ class ContainerLayer : public Layer {
                        SkRect* child_paint_bounds);
   void PaintChildren(PaintContext& context) const;
 
-#if defined(LEGACY_FUCHSIA_EMBEDDER)
-  void UpdateSceneChildren(SceneUpdateContext& context);
-#endif
-
   // Try to prepare the raster cache for a given layer.
   //
   // The raster cache would fail if either of the followings is true: