Skip to content

Commit 2b5679d

Browse files
nmouchtmnutt
authored andcommitted
PROGRESSION (263656@main): Three fast/scrolling/mac/scrollbars are a consistent failure or timeout
https://bugs.webkit.org/show_bug.cgi?id=258641 rdar://111424377 Reviewed by Tim Nguyen. Add check for scroller before querying the type. This regressed after https://commits.webkit.org/263656@main which added the type check for the select element tests, which need to use the old scrollbar testing infrastructure. * LayoutTests/resources/ui-helper.js: Canonical link: https://commits.webkit.org/265728@main
1 parent f880795 commit 2b5679d

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

LayoutTests/platform/mac-wk2/TestExpectations

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,6 @@ webkit.org/b/188924 fast/mediastream/device-change-event-2.html [ Pass Timeout ]
11061106

11071107
webkit.org/b/212721 svg/custom/textPath-change-id.svg [ Pass ImageOnlyFailure ]
11081108

1109-
webkit.org/b/212042 [ Debug ] fast/scrolling/mac/scrollbars/overlay-scrollbar-reveal.html [ Pass Timeout ]
11101109
webkit.org/b/212042 [ Debug ] fast/scrolling/mac/scrollbars/select-overlay-scrollbar-reveal.html [ Pass Timeout ]
11111110

11121111
webkit.org/b/213461 fast/mediastream/mediastreamtrack-video-frameRate-clone-increasing.html [ Pass Failure ]
@@ -1211,14 +1210,10 @@ webkit.org/b/230113 [ Monterey+ Debug arm64 ] svg/animations/animate-elem-14-t-d
12111210

12121211
webkit.org/b/230696 imported/w3c/web-platform-tests/webrtc/RTCDataChannel-close.html [ Pass Failure ]
12131212

1214-
webkit.org/b/215611 [ Debug ] fast/scrolling/mac/scrollbars/overflow-overlay-scrollbar-hovered.html [ Pass Timeout ]
1215-
12161213
# rdar://65269589 ([ macOS and iOS ] media/vp9.html is failing consistently.)
12171214
[ Monterey+ ] media/vp9.html [ Pass ]
12181215
[ Monterey+ ] webrtc/vp9-vtb.html [ Pass ]
12191216

1220-
webkit.org/b/215700 fast/scrolling/mac/scrollbars/overlay-scrollbar-hovered.html [ Pass Failure Timeout ]
1221-
12221217
webkit.org/b/214997 [ Release ] http/tests/workers/service/basic-install-event-waitUntil-reject.html [ Pass Timeout ]
12231218

12241219
webkit.org/b/215809 [ Debug ] media/W3C/video/events/event_order_canplay_canplaythrough.html [ Pass Timeout ]

LayoutTests/resources/ui-helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ window.UIHelper = class UIHelper {
855855
if (!this.isWebKit2() || this.isIOSFamily())
856856
return Promise.resolve();
857857

858-
if (internals.isUsingUISideCompositing() && scroller.nodeName != "SELECT") {
858+
if (internals.isUsingUISideCompositing() && (!scroller || scroller.nodeName != "SELECT")) {
859859
return new Promise(resolve => {
860860
testRunner.runUIScript(`(function() {
861861
uiController.doAfterNextStablePresentationUpdate(function() {

0 commit comments

Comments
 (0)