commit 207f088f73cb00fa05aff170030df891d62cadf5
author Jonah Williams <jonahwilliams@google.com> Sat Jul 20 10:29:28 2024 -0700
committer GitHub <noreply@github.com> Sat Jul 20 17:29:28 2024 +0000
tree f66bfa1555a1d164957691a6ba2b2da2aad4bcd0
parent 311abadd6bd269e83adcb46a5e00d8280259f00c

[Impeller] detect max cull rect on bounds. (#54013)

Fixes https://github.com/flutter/flutter/issues/151785

if the bounds given to impeller SaveLayer is kMaxCullRect, treat this as unbounded.

impeller/display_list/aiks_dl_unittests.cc

diff --git a/impeller/display_list/aiks_dl_unittests.cc b/impeller/display_list/aiks_dl_unittests.cc
index 1daba1e..3d60829 100644
--- a/impeller/display_list/aiks_dl_unittests.cc
+++ b/impeller/display_list/aiks_dl_unittests.cc
@@ -35,7 +35,7 @@
 }  // namespace
 
 TEST_P(AiksTest, CollapsedDrawPaintInSubpass) {
-  DisplayListBuilder builder(GetCullRect(GetWindowSize()));
+  DisplayListBuilder builder;
 
   DlPaint paint;
   paint.setColor(DlColor::kYellow());
@@ -55,7 +55,7 @@
 
 TEST_P(AiksTest, CollapsedDrawPaintInSubpassBackdropFilter) {
   // Bug: https://github.com/flutter/flutter/issues/131576
-  DisplayListBuilder builder(GetCullRect(GetWindowSize()));
+  DisplayListBuilder builder;
 
   DlPaint paint;
   paint.setColor(DlColor::kYellow());

impeller/display_list/dl_dispatcher.cc

diff --git a/impeller/display_list/dl_dispatcher.cc b/impeller/display_list/dl_dispatcher.cc
index 2a2bfb2..fcd1f7a 100644
--- a/impeller/display_list/dl_dispatcher.cc
+++ b/impeller/display_list/dl_dispatcher.cc
@@ -612,6 +612,9 @@
   GetCanvas().Save(total_content_depth);
 }
 
+static constexpr SkRect kMaxCullRect =
+    SkRect::MakeLTRB(-1E9F, -1E9F, 1E9F, 1E9F);
+
 // |flutter::DlOpReceiver|
 void DlDispatcherBase::saveLayer(const SkRect& bounds,
                                  const flutter::SaveLayerOptions& options,
@@ -622,8 +625,15 @@
   auto promise = options.content_is_clipped()
                      ? ContentBoundsPromise::kMayClipContents
                      : ContentBoundsPromise::kContainsContents;
-  GetCanvas().SaveLayer(paint, skia_conversions::ToRect(bounds),
-                        ToImageFilter(backdrop), promise, total_content_depth,
+  std::optional<Rect> impeller_bounds;
+  if (bounds == kMaxCullRect) {
+    impeller_bounds = std::nullopt;
+  } else {
+    impeller_bounds = skia_conversions::ToRect(bounds);
+  }
+
+  GetCanvas().SaveLayer(paint, impeller_bounds, ToImageFilter(backdrop),
+                        promise, total_content_depth,
                         options.can_distribute_opacity());
 }