++

Author: jonahwilliams

impeller/aiks/canvas.cc

@@ -807,7 +807,8 @@ void Canvas::SaveLayer(const Paint& paint,
                        const std::shared_ptr<ImageFilter>& backdrop_filter,
                        ContentBoundsPromise bounds_promise,
                        uint32_t total_content_depth,
-                       bool can_distribute_opacity) {
+                       bool can_distribute_opacity,
+                       bool bounds_from_caller) {
   if (can_distribute_opacity && !backdrop_filter &&
       Paint::CanApplyOpacityPeephole(paint) &&
       bounds_promise != ContentBoundsPromise::kMayClipContents) {

impeller/aiks/canvas.h

@@ -77,7 +77,8 @@ class Canvas {
       const std::shared_ptr<ImageFilter>& backdrop_filter = nullptr,
       ContentBoundsPromise bounds_promise = ContentBoundsPromise::kUnknown,
       uint32_t total_content_depth = kMaxDepth,
-      bool can_distribute_opacity = false);
+      bool can_distribute_opacity = false,
+      bool bounds_from_caller = false);
 
   virtual bool Restore();
 

impeller/aiks/experimental_canvas.cc

@@ -306,7 +306,8 @@ void ExperimentalCanvas::SaveLayer(
     const std::shared_ptr<ImageFilter>& backdrop_filter,
     ContentBoundsPromise bounds_promise,
     uint32_t total_content_depth,
-    bool can_distribute_opacity) {
+    bool can_distribute_opacity,
+    bool bounds_from_caller) {
   TRACE_EVENT0("flutter", "Canvas::saveLayer");
 
   if (bounds.has_value() && bounds->IsEmpty()) {
@@ -404,7 +405,7 @@ void ExperimentalCanvas::SaveLayer(
     FML_CHECK(clip_coverage_stack_.HasCoverage());
     subpass_coverage = coverage_limit;
     // Clip tight bounds, even if clip is flooded.
-    if (bounds.has_value()) {
+    if (bounds.has_value() && bounds_from_caller) {
       subpass_coverage =
           coverage_limit.Intersection(bounds.value()).value_or(bounds.value());
     }

impeller/aiks/experimental_canvas.h

@@ -71,7 +71,8 @@ class ExperimentalCanvas : public Canvas {
                  const std::shared_ptr<ImageFilter>& backdrop_filter,
                  ContentBoundsPromise bounds_promise,
                  uint32_t total_content_depth,
-                 bool can_distribute_opacity) override;
+                 bool can_distribute_opacity,
+                 bool bounds_from_caller) override;
 
   bool Restore() override;
 

impeller/display_list/dl_dispatcher.cc

@@ -614,7 +614,8 @@ void DlDispatcherBase::saveLayer(const SkRect& bounds,
 
   GetCanvas().SaveLayer(paint, impeller_bounds, ToImageFilter(backdrop),
                         promise, total_content_depth,
-                        options.can_distribute_opacity());
+                        options.can_distribute_opacity(),
+                        options.bounds_from_caller());
 }
 
 // |flutter::DlOpReceiver|