++

impeller/aiks/canvas_unittests.cc

@@ -3,15 +3,12 @@
 // found in the LICENSE file.
 
 #include "flutter/testing/testing.h"
-<<<<<<< HEAD
 #include "impeller/aiks/canvas.h"
 #include "impeller/aiks/image_filter.h"
 #include "impeller/geometry/color.h"
-=======
 #include "impeller/aiks/aiks_context.h"
 #include "impeller/aiks/aiks_unittests.h"
 #include "impeller/aiks/experimental_canvas.h"
->>>>>>> e10b07598091e4f31e02f5e02ac0d851fb6e7b83
 #include "impeller/geometry/path_builder.h"
 
 // TODO(zanderso): https://github.com/flutter/flutter/issues/127701

impeller/entity/entity_unittests.cc

@@ -119,7 +119,7 @@ auto CreatePassWithRectPath(
       PathBuilder{}.AddRect(rect).TakePath(), Color::Red()));
   subpass->AddEntity(std::move(entity));
   subpass->SetDelegate(std::make_unique<TestPassDelegate>(collapse));
-  subpass->SetBoundsLimit(bounds_hint, false);
+  subpass->SetBoundsLimit(bounds_hint);
   return subpass;
 }
 

impeller/entity/save_layer_utils.cc

@@ -30,12 +30,6 @@ std::optional<Rect> ComputeSaveLayerCoverage(
   // saveLayer paint. For example, if a saveLayer has a coverage limit of
   // 100x100, but it has a Matrix image filter that scales by one half, the
   // actual coverage limit is 200x200.
-  //
-  // If there is no image filter, then we can assume that the contents have
-  // absorbed the current transform and thus it has already been incorporated
-  // into any computed bounds. That is, a canvas scaling transform of 0.5
-  // changes the coverage of the contained entities directly and doesnt need to
-  // be additionally incorporated into the coverage computation here.
   if (image_filter) {
     std::optional<Rect> source_coverage_limit =
         image_filter->GetSourceCoverage(effect_transform, coverage_limit);

impeller/entity/save_layer_utils.h

@@ -13,11 +13,25 @@
 
 namespace impeller {
 
-/// Compute the coverage of the subpass in the subpass coordinate space.
+/// @brief Compute the coverage of a subpass in the global coordinate space.
 ///
-/// A return value of std::nullopt indicates that the coverage is empty or
-/// otherwise does not intersect with the parent coverage limit and should
-/// be discarded.
+/// @param content_coverage the computed coverage of the contents of the save
+///                         layer. This value may be empty if the save layer has
+///                         no contents, or  Rect::Maximum if the contents are
+///                         unbounded (like a destructive blend).
+///
+/// @param effect_transform The CTM of the subpass.
+/// @param coverage_limit   The current clip coverage. This is used to bound the
+///                         subpass size.
+/// @param image_filter     A subpass image filter, or nullptr.
+/// @param has_backdrop_filter Whether the save layer has a backdrop filter on
+///                            it.
+///
+/// The coverage computation expects `content_coverage` to be in the child
+/// coordinate space. `effect_transform` is used to transform this back into the
+/// global coordinate space. A return value of std::nullopt indicates that the
+/// coverage is empty or otherwise does not intersect with the parent coverage
+/// limit and should be discarded.
 std::optional<Rect> ComputeSaveLayerCoverage(
     const Rect& content_coverage,
     const Matrix& effect_transform,