Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c171f27

Browse files
authored
Revert "Add rects to accumulator rather than bounds (#37435)" (#37444)
This reverts commit 306b0fe.
1 parent 179154e commit c171f27

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

display_list/display_list_utils.cc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -672,12 +672,7 @@ void DisplayListBoundsCalculator::drawPicture(const sk_sp<SkPicture> picture,
672672
}
673673
void DisplayListBoundsCalculator::drawDisplayList(
674674
const sk_sp<DisplayList> display_list) {
675-
const SkRect bounds = display_list->bounds();
676-
std::list<SkRect> rects =
677-
display_list->rtree()->searchNonOverlappingDrawnRects(bounds);
678-
for (const SkRect& rect : rects) {
679-
AccumulateOpBounds(rect, kDrawDisplayListFlags);
680-
}
675+
AccumulateOpBounds(display_list->bounds(), kDrawDisplayListFlags);
681676
}
682677
void DisplayListBoundsCalculator::drawTextBlob(const sk_sp<SkTextBlob> blob,
683678
SkScalar x,

testing/scenario_app/run_ios_tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ echo "Running simulator tests with Impeller"
5252
echo ""
5353

5454
# Skip testFontRenderingWhenSuppliedWithBogusFont: https://github.com/flutter/flutter/issues/113250
55+
# Skip testOneOverlayAndTwoIntersectingOverlays: https://github.com/flutter/flutter/issues/113251
5556
set -o pipefail && xcodebuild -sdk iphonesimulator \
5657
-scheme Scenarios \
5758
-destination 'platform=iOS Simulator,OS=13.0,name=iPhone 8' \
5859
clean test \
5960
FLUTTER_ENGINE="$FLUTTER_ENGINE" \
6061
-skip-testing "ScenariosUITests/BogusFontTextTest/testFontRenderingWhenSuppliedWithBogusFont" \
62+
-skip-testing "ScenariosUITests/UnobstructedPlatformViewTests/testOneOverlayAndTwoIntersectingOverlays" \
6163
INFOPLIST_FILE="Scenarios/Info_Impeller.plist" # Plist with FLTEnableImpeller=YES

0 commit comments

Comments
 (0)