From 14710861ce7ccb6183414b9a311217bd747a9204 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 8 Nov 2022 18:10:14 -0500 Subject: [PATCH] Revert "Add rects to accumulator rather than bounds (#37435)" (#37444) This reverts commit 306b0fe9ccb17a129e16cb3e682206538ce5b359. --- display_list/display_list_utils.cc | 7 +------ testing/scenario_app/run_ios_tests.sh | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/display_list/display_list_utils.cc b/display_list/display_list_utils.cc index 75b7ac632d4e5..391723ccd1d13 100644 --- a/display_list/display_list_utils.cc +++ b/display_list/display_list_utils.cc @@ -672,12 +672,7 @@ void DisplayListBoundsCalculator::drawPicture(const sk_sp picture, } void DisplayListBoundsCalculator::drawDisplayList( const sk_sp display_list) { - const SkRect bounds = display_list->bounds(); - std::list 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 blob, SkScalar x, diff --git a/testing/scenario_app/run_ios_tests.sh b/testing/scenario_app/run_ios_tests.sh index af3a207ff05cc..d917015d35d1d 100755 --- 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