Revert "[Impeller] DlCanvas implementation wrapping Aiks canvas" (#44466

)

This reverts commit 6e90446.

See flutter/flutter#132071

ci/licenses_golden/excluded_files

@@ -32,7 +32,6 @@
 ../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc
 ../../../flutter/display_list/display_list_unittests.cc
 ../../../flutter/display_list/dl_color_unittests.cc
-../../../flutter/display_list/dl_op_spy_unittests.cc
 ../../../flutter/display_list/dl_paint_unittests.cc
 ../../../flutter/display_list/dl_vertices_unittests.cc
 ../../../flutter/display_list/effects/dl_color_filter_unittests.cc
@@ -218,6 +217,7 @@
 ../../../flutter/runtime/type_conversions_unittests.cc
 ../../../flutter/shell/common/animator_unittests.cc
 ../../../flutter/shell/common/context_options_unittests.cc
+../../../flutter/shell/common/dl_op_spy_unittests.cc
 ../../../flutter/shell/common/engine_unittests.cc
 ../../../flutter/shell/common/fixtures
 ../../../flutter/shell/common/input_events_unittests.cc

ci/licenses_golden/licenses_flutter

@@ -731,8 +731,6 @@ ORIGIN: ../../../flutter/display_list/dl_op_receiver.cc + ../../../flutter/LICEN
 ORIGIN: ../../../flutter/display_list/dl_op_receiver.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/display_list/dl_op_records.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/display_list/dl_op_records.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/display_list/dl_op_spy.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/display_list/dl_op_spy.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/display_list/dl_paint.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/display_list/dl_paint.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/display_list/dl_sampling_options.h + ../../../flutter/LICENSE
@@ -789,8 +787,6 @@ ORIGIN: ../../../flutter/flow/instrumentation.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/instrumentation.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layer_snapshot_store.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layer_snapshot_store.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/layers/aiks_layer.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/flow/layers/aiks_layer.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layers/backdrop_filter_layer.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/flow/layers/cacheable_layer.cc + ../../../flutter/LICENSE
@@ -1157,8 +1153,6 @@ ORIGIN: ../../../flutter/impeller/core/texture_descriptor.cc + ../../../flutter/
 ORIGIN: ../../../flutter/impeller/core/texture_descriptor.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/vertex_buffer.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/core/vertex_buffer.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/display_list/dl_aiks_canvas.cc + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/impeller/display_list/dl_aiks_canvas.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/display_list/dl_dispatcher.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/display_list/dl_image_impeller.cc + ../../../flutter/LICENSE
@@ -2220,6 +2214,8 @@ ORIGIN: ../../../flutter/shell/common/display.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/display.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/display_manager.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/display_manager.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/dl_op_spy.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/shell/common/dl_op_spy.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/engine.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/engine.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/shell/common/pipeline.cc + ../../../flutter/LICENSE
@@ -3451,8 +3447,6 @@ FILE: ../../../flutter/display_list/dl_op_receiver.cc
 FILE: ../../../flutter/display_list/dl_op_receiver.h
 FILE: ../../../flutter/display_list/dl_op_records.cc
 FILE: ../../../flutter/display_list/dl_op_records.h
-FILE: ../../../flutter/display_list/dl_op_spy.cc
-FILE: ../../../flutter/display_list/dl_op_spy.h
 FILE: ../../../flutter/display_list/dl_paint.cc
 FILE: ../../../flutter/display_list/dl_paint.h
 FILE: ../../../flutter/display_list/dl_sampling_options.h
@@ -3509,8 +3503,6 @@ FILE: ../../../flutter/flow/instrumentation.cc
 FILE: ../../../flutter/flow/instrumentation.h
 FILE: ../../../flutter/flow/layer_snapshot_store.cc
 FILE: ../../../flutter/flow/layer_snapshot_store.h
-FILE: ../../../flutter/flow/layers/aiks_layer.cc
-FILE: ../../../flutter/flow/layers/aiks_layer.h
 FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
 FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
 FILE: ../../../flutter/flow/layers/cacheable_layer.cc
@@ -3877,8 +3869,6 @@ FILE: ../../../flutter/impeller/core/texture_descriptor.cc
 FILE: ../../../flutter/impeller/core/texture_descriptor.h
 FILE: ../../../flutter/impeller/core/vertex_buffer.cc
 FILE: ../../../flutter/impeller/core/vertex_buffer.h
-FILE: ../../../flutter/impeller/display_list/dl_aiks_canvas.cc
-FILE: ../../../flutter/impeller/display_list/dl_aiks_canvas.h
 FILE: ../../../flutter/impeller/display_list/dl_dispatcher.cc
 FILE: ../../../flutter/impeller/display_list/dl_dispatcher.h
 FILE: ../../../flutter/impeller/display_list/dl_image_impeller.cc
@@ -4945,6 +4935,8 @@ FILE: ../../../flutter/shell/common/display.cc
 FILE: ../../../flutter/shell/common/display.h
 FILE: ../../../flutter/shell/common/display_manager.cc
 FILE: ../../../flutter/shell/common/display_manager.h
+FILE: ../../../flutter/shell/common/dl_op_spy.cc
+FILE: ../../../flutter/shell/common/dl_op_spy.h
 FILE: ../../../flutter/shell/common/engine.cc
 FILE: ../../../flutter/shell/common/engine.h
 FILE: ../../../flutter/shell/common/pipeline.cc

display_list/BUILD.gn

@@ -39,8 +39,6 @@ source_set("display_list") {
     "dl_op_receiver.h",
     "dl_op_records.cc",
     "dl_op_records.h",
-    "dl_op_spy.cc",
-    "dl_op_spy.h",
     "dl_paint.cc",
     "dl_paint.h",
     "dl_sampling_options.h",
@@ -109,7 +107,6 @@ if (enable_unittests) {
       "benchmarking/dl_complexity_unittests.cc",
       "display_list_unittests.cc",
       "dl_color_unittests.cc",
-      "dl_op_spy_unittests.cc",
       "dl_paint_unittests.cc",
       "dl_vertices_unittests.cc",
       "effects/dl_color_filter_unittests.cc",

display_list/display_list.cc

@@ -34,7 +34,7 @@ DisplayList::DisplayList(DisplayListStorage&& storage,
                          bool can_apply_group_opacity,
                          bool is_ui_thread_safe,
                          bool modifies_transparent_black,
-                         std::shared_ptr<const DlRTree> rtree)
+                         sk_sp<const DlRTree> rtree)
     : storage_(std::move(storage)),
       byte_count_(byte_count),
       op_count_(op_count),

display_list/display_list.h

@@ -254,7 +254,7 @@ class DisplayList : public SkRefCnt {
   const SkRect& bounds() const { return bounds_; }
 
   bool has_rtree() const { return rtree_ != nullptr; }
-  std::shared_ptr<const DlRTree> rtree() const { return rtree_; }
+  sk_sp<const DlRTree> rtree() const { return rtree_; }
 
   bool Equals(const DisplayList* other) const;
   bool Equals(const DisplayList& other) const { return Equals(&other); }
@@ -288,7 +288,7 @@ class DisplayList : public SkRefCnt {
               bool can_apply_group_opacity,
               bool is_ui_thread_safe,
               bool modifies_transparent_black,
-              std::shared_ptr<const DlRTree> rtree);
+              sk_sp<const DlRTree> rtree);
 
   static uint32_t next_unique_id();
 
@@ -308,7 +308,7 @@ class DisplayList : public SkRefCnt {
   const bool is_ui_thread_safe_;
   const bool modifies_transparent_black_;
 
-  const std::shared_ptr<const DlRTree> rtree_;
+  const sk_sp<const DlRTree> rtree_;
 
   void Dispatch(DlOpReceiver& ctx,
                 uint8_t* ptr,

display_list/display_list_unittests.cc

@@ -2130,7 +2130,7 @@ TEST_F(DisplayListTest, FlatDrawPointsProducesBounds) {
   }
 }
 
-static void test_rtree(const std::shared_ptr<const DlRTree>& rtree,
+static void test_rtree(const sk_sp<const DlRTree>& rtree,
                        const SkRect& query,
                        std::vector<SkRect> expected_rects,
                        const std::vector<int>& expected_indices) {

display_list/dl_builder.cc

@@ -1208,13 +1208,6 @@ void DisplayListBuilder::DrawAtlas(const sk_sp<DlImage>& atlas,
   }
 }
 
-void DisplayListBuilder::DrawImpellerPicture(
-    const std::shared_ptr<const impeller::Picture>& picture,
-    SkScalar opacity) {
-  FML_LOG(ERROR) << "Cannot draw Impeller Picture in to a a display list.";
-  FML_DCHECK(false);
-}
-
 void DisplayListBuilder::DrawDisplayList(const sk_sp<DisplayList> display_list,
                                          SkScalar opacity) {
   if (!SkScalarIsFinite(opacity) || opacity <= SK_ScalarNearlyZero ||

display_list/dl_builder.h

@@ -216,12 +216,6 @@ class DisplayListBuilder final : public virtual DlCanvas,
                  DlImageSampling sampling,
                  const SkRect* cullRect,
                  const DlPaint* paint = nullptr) override;
-
-  // |DlCanvas|
-  void DrawImpellerPicture(
-      const std::shared_ptr<const impeller::Picture>& picture,
-      SkScalar opacity = SK_Scalar1) override;
-
   // |DlCanvas|
   void DrawDisplayList(const sk_sp<DisplayList> display_list,
                        SkScalar opacity = SK_Scalar1) override;
@@ -707,7 +701,7 @@ class DisplayListBuilder final : public virtual DlCanvas,
     return accumulator_->bounds();
   }
 
-  std::shared_ptr<DlRTree> rtree() {
+  sk_sp<DlRTree> rtree() {
     FML_DCHECK(layer_stack_.size() == 1);
     if (is_unbounded()) {
       FML_LOG(INFO) << "returning partial rtree for unbounded DisplayList";

display_list/dl_canvas.h

@@ -18,10 +18,6 @@
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/core/SkTextBlob.h"
 
-namespace impeller {
-struct Picture;
-}  // namespace impeller
-
 namespace flutter {
 
 // The primary class used to express rendering operations in the
@@ -63,12 +59,7 @@ class DlCanvas {
                          const DlImageFilter* backdrop = nullptr) = 0;
   virtual void Restore() = 0;
   virtual int GetSaveCount() const = 0;
-  virtual void RestoreToCount(int restore_count) {
-    FML_DCHECK(restore_count <= GetSaveCount());
-    while (restore_count < GetSaveCount() && GetSaveCount() > 1) {
-      Restore();
-    }
-  }
+  virtual void RestoreToCount(int restore_count) = 0;
 
   virtual void Translate(SkScalar tx, SkScalar ty) = 0;
   virtual void Scale(SkScalar sx, SkScalar sy) = 0;
@@ -208,9 +199,6 @@ class DlCanvas {
                          const DlPaint* paint = nullptr) = 0;
   virtual void DrawDisplayList(const sk_sp<DisplayList> display_list,
                                SkScalar opacity = SK_Scalar1) = 0;
-  virtual void DrawImpellerPicture(
-      const std::shared_ptr<const impeller::Picture>& picture,
-      SkScalar opacity = SK_Scalar1) = 0;
   virtual void DrawTextBlob(const sk_sp<SkTextBlob>& blob,
                             SkScalar x,
                             SkScalar y,

display_list/geometry/dl_rtree.h

@@ -25,7 +25,7 @@ namespace flutter {
 /// - Query for a set of non-overlapping rectangles that are joined
 ///   from the original rectangles that intersect a query rect
 ///   @see |searchAndConsolidateRects|
-class DlRTree {
+class DlRTree : public SkRefCnt {
  private:
   static constexpr int kMaxChildren = 11;
 

display_list/skia/dl_sk_canvas.cc

@@ -335,13 +335,6 @@ void DlSkCanvasAdapter::DrawAtlas(const sk_sp<DlImage>& atlas,
                        ToSk(sampling), cullRect, sk_paint());
 }
 
-void DlSkCanvasAdapter::DrawImpellerPicture(
-    const std::shared_ptr<const impeller::Picture>& picture,
-    SkScalar opacity) {
-  FML_LOG(ERROR) << "Cannot draw Impeller Picture in to a Skia canvas.";
-  FML_DCHECK(false);
-}
-
 void DlSkCanvasAdapter::DrawDisplayList(const sk_sp<DisplayList> display_list,
                                         SkScalar opacity) {
   const int restore_count = delegate_->getSaveCount();

display_list/skia/dl_sk_canvas.h

@@ -136,9 +136,6 @@ class DlSkCanvasAdapter final : public virtual DlCanvas {
                  DlImageSampling sampling,
                  const SkRect* cullRect,
                  const DlPaint* paint = nullptr) override;
-  void DrawImpellerPicture(
-      const std::shared_ptr<const impeller::Picture>& picture,
-      SkScalar opacity = SK_Scalar1) override;
   void DrawDisplayList(const sk_sp<DisplayList> display_list,
                        SkScalar opacity = SK_Scalar1) override;
   void DrawTextBlob(const sk_sp<SkTextBlob>& blob,

display_list/utils/dl_bounds_accumulator.cc

@@ -125,11 +125,10 @@ SkRect RTreeBoundsAccumulator::bounds() const {
   return accumulator.bounds();
 }
 
-std::shared_ptr<DlRTree> RTreeBoundsAccumulator::rtree() const {
+sk_sp<DlRTree> RTreeBoundsAccumulator::rtree() const {
   FML_DCHECK(saved_offsets_.empty());
-  return std::make_shared<DlRTree>(rects_.data(), rects_.size(),
-                                   rect_indices_.data(),
-                                   [](int id) { return id >= 0; });
+  return sk_make_sp<DlRTree>(rects_.data(), rects_.size(), rect_indices_.data(),
+                             [](int id) { return id >= 0; });
 }
 
 }  // namespace flutter

display_list/utils/dl_bounds_accumulator.h

@@ -84,7 +84,7 @@ class BoundsAccumulator {
 
   virtual SkRect bounds() const = 0;
 
-  virtual std::shared_ptr<DlRTree> rtree() const = 0;
+  virtual sk_sp<DlRTree> rtree() const = 0;
 
   virtual BoundsAccumulatorType type() const = 0;
 };
@@ -112,7 +112,7 @@ class RectBoundsAccumulator final : public virtual BoundsAccumulator {
     return BoundsAccumulatorType::kRect;
   }
 
-  std::shared_ptr<DlRTree> rtree() const override { return nullptr; }
+  sk_sp<DlRTree> rtree() const override { return nullptr; }
 
  private:
   class AccumulationRect {
@@ -151,7 +151,7 @@ class RTreeBoundsAccumulator final : public virtual BoundsAccumulator {
 
   SkRect bounds() const override;
 
-  std::shared_ptr<DlRTree> rtree() const override;
+  sk_sp<DlRTree> rtree() const override;
 
   BoundsAccumulatorType type() const override {
     return BoundsAccumulatorType::kRTree;

flow/BUILD.gn

@@ -22,8 +22,6 @@ source_set("flow") {
     "instrumentation.h",
     "layer_snapshot_store.cc",
     "layer_snapshot_store.h",
-    "layers/aiks_layer.cc",
-    "layers/aiks_layer.h",
     "layers/backdrop_filter_layer.cc",
     "layers/backdrop_filter_layer.h",
     "layers/cacheable_layer.cc",

flow/embedded_views.cc

@@ -3,45 +3,9 @@
 // found in the LICENSE file.
 
 #include "flutter/flow/embedded_views.h"
-#include "flutter/display_list/dl_op_spy.h"
 
 namespace flutter {
 
-#if IMPELLER_SUPPORTS_RENDERING
-ImpellerEmbedderViewSlice::ImpellerEmbedderViewSlice(SkRect view_bounds) {
-  canvas_ = std::make_unique<impeller::DlAiksCanvas>(
-      /*bounds=*/view_bounds);
-}
-
-DlCanvas* ImpellerEmbedderViewSlice::canvas() {
-  return canvas_ ? canvas_.get() : nullptr;
-}
-
-void ImpellerEmbedderViewSlice::end_recording() {
-  picture_ =
-      std::make_shared<impeller::Picture>(canvas_->EndRecordingAsPicture());
-  canvas_.reset();
-}
-
-std::list<SkRect> ImpellerEmbedderViewSlice::searchNonOverlappingDrawnRects(
-    const SkRect& query) const {
-  FML_DCHECK(picture_);
-  return picture_->rtree->searchAndConsolidateRects(query);
-}
-
-void ImpellerEmbedderViewSlice::render_into(DlCanvas* canvas) {
-  canvas->DrawImpellerPicture(picture_);
-}
-
-bool ImpellerEmbedderViewSlice::recording_ended() {
-  return canvas_ == nullptr;
-}
-
-bool ImpellerEmbedderViewSlice::renders_anything() {
-  return !picture_->rtree->bounds().isEmpty();
-}
-#endif  // IMPELLER_SUPPORTS_RENDERING
-
 DisplayListEmbedderViewSlice::DisplayListEmbedderViewSlice(SkRect view_bounds) {
   builder_ = std::make_unique<DisplayListBuilder>(
       /*bounds=*/view_bounds,
@@ -66,6 +30,10 @@ void DisplayListEmbedderViewSlice::render_into(DlCanvas* canvas) {
   canvas->DrawDisplayList(display_list_);
 }
 
+void DisplayListEmbedderViewSlice::dispatch(DlOpReceiver& receiver) {
+  display_list_->Dispatch(receiver);
+}
+
 bool DisplayListEmbedderViewSlice::is_empty() {
   return display_list_->bounds().isEmpty();
 }
@@ -74,12 +42,6 @@ bool DisplayListEmbedderViewSlice::recording_ended() {
   return builder_ == nullptr;
 }
 
-bool DisplayListEmbedderViewSlice::renders_anything() {
-  DlOpSpy dl_op_spy;
-  display_list_->Dispatch(dl_op_spy);
-  return dl_op_spy.did_draw() && !is_empty();
-}
-
 void ExternalViewEmbedder::SubmitFrame(
     GrDirectContext* context,
     const std::shared_ptr<impeller::AiksContext>& aiks_context,