as a counter

Author: dnfield

flow/compositor_context.cc

@@ -88,7 +88,6 @@ RasterStatus CompositorContext::ScopedFrame::Raster(
   // paints some raster cache.
   if (canvas()) {
     if (needs_save_layer) {
-      FML_LOG(INFO) << "Using SaveLayer to protect non-readback surface";
       SkRect bounds = SkRect::Make(layer_tree.frame_size());
       SkPaint paint;
       paint.setBlendMode(SkBlendMode::kSrc);

flow/layers/clip_path_layer.cc

@@ -64,6 +64,7 @@ void ClipPathLayer::Paint(PaintContext& context) const {
 
   if (UsesSaveLayer()) {
     context.internal_nodes_canvas->saveLayer(paint_bounds(), nullptr);
+    context.save_layer_count += 1;
   }
   PaintChildren(context);
   if (UsesSaveLayer()) {

flow/layers/clip_rect_layer.cc

@@ -63,6 +63,7 @@ void ClipRectLayer::Paint(PaintContext& context) const {
 
   if (UsesSaveLayer()) {
     context.internal_nodes_canvas->saveLayer(clip_rect_, nullptr);
+    context.save_layer_count += 1;
   }
   PaintChildren(context);
   if (UsesSaveLayer()) {

flow/layers/clip_rrect_layer.cc

@@ -64,6 +64,7 @@ void ClipRRectLayer::Paint(PaintContext& context) const {
 
   if (UsesSaveLayer()) {
     context.internal_nodes_canvas->saveLayer(paint_bounds(), nullptr);
+    context.save_layer_count += 1;
   }
   PaintChildren(context);
   if (UsesSaveLayer()) {

flow/layers/color_filter_layer.cc

@@ -39,6 +39,8 @@ void ColorFilterLayer::Paint(PaintContext& context) const {
   TRACE_EVENT0("flutter", "ColorFilterLayer::Paint");
   FML_DCHECK(needs_painting(context));
 
+  // TODO(92937): ColorFilterLayer should do raster caching here.
+
   SkPaint paint;
   paint.setColorFilter(filter_);
 

flow/layers/display_list_layer.cc

@@ -11,11 +11,13 @@ namespace flutter {
 DisplayListLayer::DisplayListLayer(const SkPoint& offset,
                                    SkiaGPUObject<DisplayList> display_list,
                                    bool is_complex,
-                                   bool will_change)
+                                   bool will_change,
+                                   size_t save_layer_count)
     : offset_(offset),
       display_list_(std::move(display_list)),
       is_complex_(is_complex),
-      will_change_(will_change) {}
+      will_change_(will_change),
+      save_layer_count_(save_layer_count) {}
 
 #ifdef FLUTTER_ENABLE_DIFF_CONTEXT
 
@@ -96,7 +98,7 @@ void DisplayListLayer::Preroll(PrerollContext* context,
   if (auto* cache = context->raster_cache) {
     TRACE_EVENT0("flutter", "DisplayListLayer::RasterCache (Preroll)");
     cache->Prepare(context, disp_list, is_complex_, will_change_, matrix,
-                   offset_);
+                   save_layer_count_, offset_);
   }
 
   SkRect bounds = disp_list->bounds().makeOffset(offset_.x(), offset_.y());
@@ -121,6 +123,7 @@ void DisplayListLayer::Paint(PaintContext& context) const {
     return;
   }
 
+  context.save_layer_count += save_layer_count_;
   display_list()->RenderTo(context.leaf_nodes_canvas);
 }
 

flow/layers/display_list_layer.h

@@ -18,7 +18,8 @@ class DisplayListLayer : public Layer {
   DisplayListLayer(const SkPoint& offset,
                    SkiaGPUObject<DisplayList> display_list,
                    bool is_complex,
-                   bool will_change);
+                   bool will_change,
+                   size_t save_layer_count);
 
   DisplayList* display_list() const {
     return display_list_.skia_object().get();
@@ -40,11 +41,16 @@ class DisplayListLayer : public Layer {
 
   void Paint(PaintContext& context) const override;
 
+  size_t save_layer_count() const override {
+    return save_layer_count_;
+  }
+
  private:
   SkPoint offset_;
   flutter::SkiaGPUObject<DisplayList> display_list_;
   bool is_complex_ = false;
   bool will_change_ = false;
+  size_t save_layer_count_ = 0;
 
 #ifdef FLUTTER_ENABLE_DIFF_CONTEXT
 

flow/layers/display_list_layer_unittests.cc

@@ -24,7 +24,7 @@ using DisplayListLayerTest = SkiaGPUObjectLayerTest;
 TEST_F(DisplayListLayerTest, PaintBeforePrerollInvalidDisplayListDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(), false, false);
+      layer_offset, SkiaGPUObject<DisplayList>(), false, false, 0);
 
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
                             "display_list_\\.skia_object\\(\\)");
@@ -38,7 +38,7 @@ TEST_F(DisplayListLayerTest, PaintBeforePrerollDies) {
   auto display_list = builder.Build();
   auto layer = std::make_shared<DisplayListLayer>(
       layer_offset, SkiaGPUObject<DisplayList>(display_list, unref_queue()),
-      false, false);
+      false, false, 0);
 
   EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
   EXPECT_DEATH_IF_SUPPORTED(layer->Paint(paint_context()),
@@ -53,7 +53,7 @@ TEST_F(DisplayListLayerTest, PaintingEmptyLayerDies) {
   auto display_list = builder.Build();
   auto layer = std::make_shared<DisplayListLayer>(
       layer_offset, SkiaGPUObject<DisplayList>(display_list, unref_queue()),
-      false, false);
+      false, false, 0);
 
   layer->Preroll(preroll_context(), SkMatrix());
   EXPECT_EQ(layer->paint_bounds(), SkRect::MakeEmpty());
@@ -66,7 +66,7 @@ TEST_F(DisplayListLayerTest, PaintingEmptyLayerDies) {
 TEST_F(DisplayListLayerTest, InvalidDisplayListDies) {
   const SkPoint layer_offset = SkPoint::Make(0.0f, 0.0f);
   auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject<DisplayList>(), false, false);
+      layer_offset, SkiaGPUObject<DisplayList>(), false, false, 0);
 
   // Crashes reading a nullptr.
   EXPECT_DEATH_IF_SUPPORTED(layer->Preroll(preroll_context(), SkMatrix()), "");
@@ -82,7 +82,8 @@ TEST_F(DisplayListLayerTest, SimpleDisplayList) {
   builder.drawRect(picture_bounds);
   auto display_list = builder.Build();
   auto layer = std::make_shared<DisplayListLayer>(
-      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false);
+      layer_offset, SkiaGPUObject(display_list, unref_queue()), false, false,
+      0);
 
   layer->Preroll(preroll_context(), SkMatrix());
   EXPECT_EQ(layer->paint_bounds(),

flow/layers/image_filter_layer.cc

@@ -68,6 +68,7 @@ void ImageFilterLayer::Preroll(PrerollContext* context,
     // from frame to frame so we try to cache the layer itself
     // for maximum performance.
     TryToPrepareRasterCache(context, this, matrix);
+    context->save_layer_count += 1;
   } else {
     // This ImageFilterLayer is not yet considered stable so we
     // increment the count to measure how many times it has been
@@ -89,6 +90,7 @@ void ImageFilterLayer::Preroll(PrerollContext* context,
       // switch during the Paint phase even if they are not stable.
       // This benefit is seen most during animations.
       TryToPrepareRasterCache(context, GetCacheableChild(), matrix);
+      context->save_layer_count += 1;
     }
   }
 }

flow/layers/layer.cc

@@ -56,7 +56,7 @@ Layer::AutoPrerollSaveLayerState::~AutoPrerollSaveLayerState() {
   }
 }
 
-Layer::AutoSaveLayer::AutoSaveLayer(const PaintContext& paint_context,
+Layer::AutoSaveLayer::AutoSaveLayer(PaintContext& paint_context,
                                     const SkRect& bounds,
                                     const SkPaint* paint,
                                     SaveMode save_mode)
@@ -66,9 +66,10 @@ Layer::AutoSaveLayer::AutoSaveLayer(const PaintContext& paint_context,
                   ? *(paint_context.internal_nodes_canvas)
                   : *(paint_context.leaf_nodes_canvas)) {
   canvas_.saveLayer(bounds_, paint);
+  paint_context.save_layer_count += 1;
 }
 
-Layer::AutoSaveLayer::AutoSaveLayer(const PaintContext& paint_context,
+Layer::AutoSaveLayer::AutoSaveLayer(PaintContext& paint_context,
                                     const SkCanvas::SaveLayerRec& layer_rec,
                                     SaveMode save_mode)
     : paint_context_(paint_context),
@@ -77,18 +78,19 @@ Layer::AutoSaveLayer::AutoSaveLayer(const PaintContext& paint_context,
                   ? *(paint_context.internal_nodes_canvas)
                   : *(paint_context.leaf_nodes_canvas)) {
   canvas_.saveLayer(layer_rec);
+  paint_context.save_layer_count += 1;
 }
 
 Layer::AutoSaveLayer Layer::AutoSaveLayer::Create(
-    const PaintContext& paint_context,
+    PaintContext& paint_context,
     const SkRect& bounds,
     const SkPaint* paint,
     SaveMode save_mode) {
   return Layer::AutoSaveLayer(paint_context, bounds, paint, save_mode);
 }
 
 Layer::AutoSaveLayer Layer::AutoSaveLayer::Create(
-    const PaintContext& paint_context,
+    PaintContext& paint_context,
     const SkCanvas::SaveLayerRec& layer_rec,
     SaveMode save_mode) {
   return Layer::AutoSaveLayer(paint_context, layer_rec, save_mode);