Revert "Add rects to accumulator rather than bounds (flutter#37435)" (f…

…lutter#37444) This reverts commit 306b0fe.
mnordine · Nov 8, 2022 · c171f27 · c171f27
1 parent 179154e
commit c171f27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/display_list/display_list_utils.cc b/display_list/display_list_utils.cc
@@ -672,12 +672,7 @@ void DisplayListBoundsCalculator::drawPicture(const sk_sp<SkPicture> picture,
 }
 void DisplayListBoundsCalculator::drawDisplayList(
     const sk_sp<DisplayList> display_list) {
-  const SkRect bounds = display_list->bounds();
-  std::list<SkRect> rects =
-      display_list->rtree()->searchNonOverlappingDrawnRects(bounds);
-  for (const SkRect& rect : rects) {
-    AccumulateOpBounds(rect, kDrawDisplayListFlags);
-  }
+  AccumulateOpBounds(display_list->bounds(), kDrawDisplayListFlags);
 }
 void DisplayListBoundsCalculator::drawTextBlob(const sk_sp<SkTextBlob> blob,
                                                SkScalar x,

diff --git a/testing/scenario_app/run_ios_tests.sh b/testing/scenario_app/run_ios_tests.sh
@@ -52,10 +52,12 @@ echo "Running simulator tests with Impeller"
 echo ""
 
 # Skip testFontRenderingWhenSuppliedWithBogusFont: https://github.com/flutter/flutter/issues/113250
+# Skip testOneOverlayAndTwoIntersectingOverlays: https://github.com/flutter/flutter/issues/113251
 set -o pipefail && xcodebuild -sdk iphonesimulator \
   -scheme Scenarios \
   -destination 'platform=iOS Simulator,OS=13.0,name=iPhone 8' \
   clean test \
   FLUTTER_ENGINE="$FLUTTER_ENGINE" \
   -skip-testing "ScenariosUITests/BogusFontTextTest/testFontRenderingWhenSuppliedWithBogusFont" \
+  -skip-testing "ScenariosUITests/UnobstructedPlatformViewTests/testOneOverlayAndTwoIntersectingOverlays" \
   INFOPLIST_FILE="Scenarios/Info_Impeller.plist" # Plist with FLTEnableImpeller=YES