Migrate Embedder code to impeller/DL geometry classes (flutter#172804)

Ticks off another checkbox in
flutter#161456

Author: flar

engine/src/flutter/display_list/geometry/dl_geometry_conversions.h

@@ -27,10 +27,6 @@ inline const DlPoint& ToDlPoint(const SkPoint& point) {
   return *reinterpret_cast<const DlPoint*>(&point);
 }
 
-inline const DlPoint* ToDlPoints(const SkPoint* points) {
-  return points == nullptr ? nullptr : reinterpret_cast<const DlPoint*>(points);
-}
-
 inline const DlRect& ToDlRect(const SkRect& rect) {
   return *reinterpret_cast<const DlRect*>(&rect);
 }
@@ -43,22 +39,6 @@ inline const DlIRect& ToDlIRect(const SkIRect& rect) {
   return *reinterpret_cast<const DlIRect*>(&rect);
 }
 
-inline DlRect* ToDlRect(SkRect* rect) {
-  return rect == nullptr ? nullptr : reinterpret_cast<DlRect*>(rect);
-}
-
-inline const DlRect* ToDlRect(const SkRect* rect) {
-  return rect == nullptr ? nullptr : reinterpret_cast<const DlRect*>(rect);
-}
-
-inline std::optional<const DlRect> ToOptDlRect(const SkRect* rect) {
-  return rect == nullptr ? std::nullopt : std::optional(ToDlRect(*rect));
-}
-
-inline const DlRect* ToDlRects(const SkRect* rects) {
-  return rects == nullptr ? nullptr : reinterpret_cast<const DlRect*>(rects);
-}
-
 inline const DlISize& ToDlISize(const SkISize& size) {
   return *reinterpret_cast<const DlISize*>(&size);
 }

engine/src/flutter/flow/embedded_view_params_unittests.cc

@@ -11,67 +11,47 @@ namespace testing {
 
 TEST(EmbeddedViewParams, GetBoundingRectAfterMutationsWithNoMutations) {
   MutatorsStack stack;
-  SkMatrix matrix;
-
-  EmbeddedViewParams params(matrix, SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), 1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), 1));
+  DlMatrix matrix;
+
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(), DlRect::MakeXYWH(0, 0, 1, 1));
 }
 
 TEST(EmbeddedViewParams, GetBoundingRectAfterMutationsWithScale) {
   MutatorsStack stack;
   DlMatrix matrix = DlMatrix::MakeScale({2, 2, 1});
   stack.PushTransform(matrix);
 
-  EmbeddedViewParams params(ToSkMatrix(matrix), SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), 2));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), 2));
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(), DlRect::MakeXYWH(0, 0, 2, 2));
 }
 
 TEST(EmbeddedViewParams, GetBoundingRectAfterMutationsWithTranslate) {
   MutatorsStack stack;
   DlMatrix matrix = DlMatrix::MakeTranslation({1, 1});
   stack.PushTransform(matrix);
 
-  EmbeddedViewParams params(ToSkMatrix(matrix), SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), 1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), 1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), 1));
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(), DlRect::MakeXYWH(1, 1, 1, 1));
 }
 
 TEST(EmbeddedViewParams, GetBoundingRectAfterMutationsWithRotation90) {
   MutatorsStack stack;
   DlMatrix matrix = DlMatrix::MakeRotationZ(DlDegrees(90));
   stack.PushTransform(matrix);
 
-  EmbeddedViewParams params(ToSkMatrix(matrix), SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), -1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), 1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), 1));
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(), DlRect::MakeXYWH(-1, 0, 1, 1));
 }
 
 TEST(EmbeddedViewParams, GetBoundingRectAfterMutationsWithRotation45) {
   MutatorsStack stack;
   DlMatrix matrix = DlMatrix::MakeRotationZ(DlDegrees(45));
   stack.PushTransform(matrix);
 
-  EmbeddedViewParams params(ToSkMatrix(matrix), SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), -sqrt(2) / 2));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 0));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), sqrt(2)));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), sqrt(2)));
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(),
+            DlRect::MakeXYWH(-sqrt(2) / 2, 0, sqrt(2), sqrt(2)));
 }
 
 TEST(EmbeddedViewParams,
@@ -83,12 +63,8 @@ TEST(EmbeddedViewParams,
   MutatorsStack stack;
   stack.PushTransform(matrix);
 
-  EmbeddedViewParams params(ToSkMatrix(matrix), SkSize::Make(1, 1), stack);
-  const SkRect& rect = params.finalBoundingRect();
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.x(), -1));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.y(), 2));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.width(), 3));
-  ASSERT_TRUE(SkScalarNearlyEqual(rect.height(), 3));
+  EmbeddedViewParams params(matrix, DlSize(1, 1), stack);
+  EXPECT_EQ(params.finalBoundingRect(), DlRect::MakeXYWH(-1, 2, 3, 3));
 }
 
 }  // namespace testing

engine/src/flutter/flow/embedded_views.cc

@@ -6,9 +6,9 @@
 
 namespace flutter {
 
-DisplayListEmbedderViewSlice::DisplayListEmbedderViewSlice(SkRect view_bounds) {
+DisplayListEmbedderViewSlice::DisplayListEmbedderViewSlice(DlRect view_bounds) {
   builder_ = std::make_unique<DisplayListBuilder>(
-      /*bounds=*/ToDlRect(view_bounds),
+      /*bounds=*/view_bounds,
       /*prepare_rtree=*/true);
 }
 

engine/src/flutter/flow/embedded_views.h

@@ -223,39 +223,36 @@ class EmbeddedViewParams {
  public:
   EmbeddedViewParams() = default;
 
-  EmbeddedViewParams(SkMatrix matrix,
-                     SkSize size_points,
+  EmbeddedViewParams(DlMatrix matrix,
+                     DlSize size_points,
                      MutatorsStack mutators_stack)
       : matrix_(matrix),
         size_points_(size_points),
         mutators_stack_(std::move(mutators_stack)) {
-    SkPath path;
-    SkRect starting_rect = SkRect::MakeSize(size_points);
-    path.addRect(starting_rect);
-    path.transform(matrix);
-    final_bounding_rect_ = path.getBounds();
+    final_bounding_rect_ =
+        DlRect::MakeSize(size_points).TransformAndClipBounds(matrix);
   }
 
   // The transformation Matrix corresponding to the sum of all the
   // transformations in the platform view's mutator stack.
-  const SkMatrix& transformMatrix() const { return matrix_; };
+  const DlMatrix& transformMatrix() const { return matrix_; };
   // The original size of the platform view before any mutation matrix is
   // applied.
-  const SkSize& sizePoints() const { return size_points_; };
+  const DlSize& sizePoints() const { return size_points_; };
   // The mutators stack contains the detailed step by step mutations for this
   // platform view.
   const MutatorsStack& mutatorsStack() const { return mutators_stack_; };
   // The bounding rect of the platform view after applying all the mutations.
   //
   // Clippings are ignored.
-  const SkRect& finalBoundingRect() const { return final_bounding_rect_; }
+  const DlRect& finalBoundingRect() const { return final_bounding_rect_; }
 
   // Pushes the stored DlImageFilter object to the mutators stack.
   //
   // `filter_rect` is in global coordinates.
   void PushImageFilter(const std::shared_ptr<DlImageFilter>& filter,
-                       const SkRect& filter_rect) {
-    mutators_stack_.PushBackdropFilter(filter, ToDlRect(filter_rect));
+                       const DlRect& filter_rect) {
+    mutators_stack_.PushBackdropFilter(filter, filter_rect);
   }
 
   bool operator==(const EmbeddedViewParams& other) const {
@@ -266,10 +263,10 @@ class EmbeddedViewParams {
   }
 
  private:
-  SkMatrix matrix_;
-  SkSize size_points_;
+  DlMatrix matrix_;
+  DlSize size_points_;
   MutatorsStack mutators_stack_;
-  SkRect final_bounding_rect_;
+  DlRect final_bounding_rect_;
 };
 
 enum class PostPrerollResult {
@@ -285,11 +282,8 @@ enum class PostPrerollResult {
 };
 
 // The |EmbedderViewSlice| represents the details of recording all of
-// the layer tree rendering operations that appear between before, after
-// and between the embedded views. The Slice used to abstract away
-// implementations that were based on either an SkPicture or a
-// DisplayListBuilder but more recently all of the embedder recordings
-// have standardized on the DisplayList.
+// the layer tree rendering operations that appear before, after
+// and between the embedded views.
 class EmbedderViewSlice {
  public:
   virtual ~EmbedderViewSlice() = default;
@@ -306,7 +300,7 @@ class EmbedderViewSlice {
 
 class DisplayListEmbedderViewSlice : public EmbedderViewSlice {
  public:
-  explicit DisplayListEmbedderViewSlice(SkRect view_bounds);
+  explicit DisplayListEmbedderViewSlice(DlRect view_bounds);
   ~DisplayListEmbedderViewSlice() override = default;
 
   DlCanvas* canvas() override;
@@ -402,15 +396,15 @@ class ExternalViewEmbedder {
   virtual DlCanvas* CompositeEmbeddedView(int64_t platform_view_id) = 0;
 
   // Prepare for a view to be drawn.
-  virtual void PrepareFlutterView(SkISize frame_size,
+  virtual void PrepareFlutterView(DlISize frame_size,
                                   double device_pixel_ratio) = 0;
 
   // Submits the content stored since |PrepareFlutterView| to the specified
   // Flutter view.
   //
   // Implementers must submit the frame by calling frame.Submit().
   //
-  // This method can mutate the root Skia canvas before submitting the frame.
+  // This method can mutate the root canvas before submitting the frame.
   //
   // It can also allocate frames for overlay surfaces to compose hybrid views.
   virtual void SubmitFlutterView(
@@ -469,7 +463,7 @@ class ExternalViewEmbedder {
   // visited platform views list.
   virtual void PushFilterToVisitedPlatformViews(
       const std::shared_ptr<DlImageFilter>& filter,
-      const SkRect& filter_rect) {}
+      const DlRect& filter_rect) {}
 
  private:
   bool used_this_frame_ = false;

engine/src/flutter/flow/layers/backdrop_filter_layer.cc

@@ -45,7 +45,7 @@ void BackdropFilterLayer::Preroll(PrerollContext* context) {
       Layer::AutoPrerollSaveLayerState::Create(context, true, bool{filter_});
   if (filter_ && context->view_embedder != nullptr) {
     context->view_embedder->PushFilterToVisitedPlatformViews(
-        filter_, ToSkRect(context->state_stack.device_cull_rect()));
+        filter_, context->state_stack.device_cull_rect());
   }
   DlRect child_paint_bounds;
   PrerollChildren(context, &child_paint_bounds);

engine/src/flutter/flow/layers/platform_view_layer.cc

@@ -26,8 +26,8 @@ void PlatformViewLayer::Preroll(PrerollContext* context) {
   MutatorsStack mutators;
   context->state_stack.fill(&mutators);
   std::unique_ptr<EmbeddedViewParams> params =
-      std::make_unique<EmbeddedViewParams>(
-          ToSkMatrix(context->state_stack.matrix()), ToSkSize(size_), mutators);
+      std::make_unique<EmbeddedViewParams>(context->state_stack.matrix(), size_,
+                                           mutators);
   context->view_embedder->PrerollCompositeEmbeddedView(view_id_,
                                                        std::move(params));
   context->view_embedder->PushVisitedPlatformView(view_id_);

engine/src/flutter/flow/layers/platform_view_layer.h

@@ -7,8 +7,6 @@
 
 #include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "flutter/flow/layers/layer.h"
-#include "third_party/skia/include/core/SkPoint.h"
-#include "third_party/skia/include/core/SkSize.h"
 
 namespace flutter {
 

engine/src/flutter/flow/testing/mock_embedder.cc

@@ -29,7 +29,7 @@ void MockViewEmbedder::BeginFrame(
     const fml::RefPtr<fml::RasterThreadMerger>& raster_thread_merger) {}
 
 // |ExternalViewEmbedder|
-void MockViewEmbedder::PrepareFlutterView(SkISize frame_size,
+void MockViewEmbedder::PrepareFlutterView(DlISize frame_size,
                                           double device_pixel_ratio) {}
 
 // |ExternalViewEmbedder|

engine/src/flutter/flow/testing/mock_embedder.h

@@ -30,7 +30,7 @@ class MockViewEmbedder : public ExternalViewEmbedder {
                       raster_thread_merger) override;
 
   // |ExternalViewEmbedder|
-  void PrepareFlutterView(SkISize frame_size,
+  void PrepareFlutterView(DlISize frame_size,
                           double device_pixel_ratio) override;
 
   // |ExternalViewEmbedder|

engine/src/flutter/flow/view_slicer.cc

@@ -10,13 +10,13 @@
 
 namespace flutter {
 
-std::unordered_map<int64_t, SkRect> SliceViews(
+std::unordered_map<int64_t, DlRect> SliceViews(
     DlCanvas* background_canvas,
     const std::vector<int64_t>& composition_order,
     const std::unordered_map<int64_t, std::unique_ptr<EmbedderViewSlice>>&
         slices,
-    const std::unordered_map<int64_t, SkRect>& view_rects) {
-  std::unordered_map<int64_t, SkRect> overlay_layers;
+    const std::unordered_map<int64_t, DlRect>& view_rects) {
+  std::unordered_map<int64_t, DlRect> overlay_layers;
 
   auto current_frame_view_count = composition_order.size();
 
@@ -49,15 +49,15 @@ std::unordered_map<int64_t, SkRect> SliceViews(
         continue;
       }
 
-      const SkRect current_view_rect = maybe_rect->second;
+      const DlRect current_view_rect = maybe_rect->second;
       const DlIRect rounded_in_platform_view_rect =
-          DlIRect::RoundIn(ToDlRect(current_view_rect));
+          DlIRect::RoundIn(current_view_rect);
       const DlRect rounded_out_platform_view_rect =
-          DlRect::RoundOut(ToDlRect(current_view_rect));
+          DlRect::RoundOut(current_view_rect);
 
       // Each rect corresponds to a native view that renders Flutter UI.
       std::vector<DlIRect> intersection_rects =
-          slice->region(ToDlRect(current_view_rect)).getRects();
+          slice->region(current_view_rect).getRects();
 
       // Ignore intersections of single width/height on the edge of the platform
       // view.
@@ -108,7 +108,7 @@ std::unordered_map<int64_t, SkRect> SliceViews(
     }
 
     if (!full_joined_rect.IsEmpty()) {
-      overlay_layers.insert({view_id, ToSkRect(full_joined_rect)});
+      overlay_layers.insert({view_id, full_joined_rect});
 
       // Clip the background canvas, so it doesn't contain any of the pixels
       // drawn on the overlay layer.