Diff
Modified: trunk/LayoutTests/ChangeLog (258700 => 258701)
--- trunk/LayoutTests/ChangeLog 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/ChangeLog 2020-03-19 16:03:04 UTC (rev 258701)
@@ -1,3 +1,31 @@
+2020-03-19 Simon Fraser <[email protected]>
+
+ Many tests relying on eventSender.monitorWheelEvents() are no longer flaky
+ https://bugs.webkit.org/show_bug.cgi?id=209272
+
+ Reviewed by Wenson Hsieh.
+
+ Remove tests from TestExpectations that were flakey because of bug 197819.
+
+ Fix some scroll-snap tests which were written before CSS OM View changes made document.body
+ not the scrolling element.
+
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+ * tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt:
+ * tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt:
+ * tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt:
+ * tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html:
+
2020-03-19 Eric Carlson <[email protected]>
Allow for some tolerance when checking canvas pixels in fast/mediastream tests
Modified: trunk/LayoutTests/platform/mac/TestExpectations (258700 => 258701)
--- trunk/LayoutTests/platform/mac/TestExpectations 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2020-03-19 16:03:04 UTC (rev 258701)
@@ -1757,8 +1757,6 @@
webkit.org/b/190882 [ Mojave+ ] animations/change-one-anim.html [ Pass Failure ]
-webkit.org/b/195635 scrollingcoordinator/mac/multiple-fixed.html [ Pass Timeout ]
-
# <rdar://problem/48781098>
[ Catalina+ ] fast/images/animated-heics-draw.html [ Pass ]
[ Catalina+ ] fast/images/animated-heics-verify.html [ Pass ]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (258700 => 258701)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-19 16:03:04 UTC (rev 258701)
@@ -321,17 +321,6 @@
webkit.org/b/172544 [ Debug ] tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html [ Pass Failure ]
-webkit.org/b/136554 tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability.html [ Pass Failure ]
-webkit.org/b/139901 tiled-drawing/scrolling/frames/frameset-frame-scrollability.html [ Pass Failure ]
-
-webkit.org/b/167661 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html [ Pass Failure ]
-webkit.org/b/148407 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html [ Pass Failure ]
-webkit.org/b/148407 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html [ Pass Failure ]
-webkit.org/b/165196 tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html [ Pass Failure ]
-webkit.org/b/196115 tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe.html [ Skip ]
-
-webkit.org/b/148408 tiled-drawing/scrolling/root-overflow-with-mousewheel.html [ Pass Failure Timeout ]
-
webkit.org/b/139820 fast/frames/lots-of-objects.html [ Pass Timeout ]
webkit.org/b/139820 fast/frames/lots-of-iframes.html [ Pass Timeout ]
@@ -591,10 +580,6 @@
webkit.org/b/161742 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/keyorder.htm [ Pass Failure ]
-webkit.org/b/161547 [ Debug ] tiled-drawing/scrolling/fixed/four-bars-zoomed.html [ Pass Failure ]
-webkit.org/b/188096 [ Release ] tiled-drawing/scrolling/fixed/four-bars-zoomed.html [ Pass Failure ]
-
-
webkit.org/b/162081 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ]
webkit.org/b/162081 editing/inserting/smart-quote-with-all-configurations.html [ Failure ]
webkit.org/b/162081 fast/events/input-event-insert-link.html [ Failure ]
@@ -763,8 +748,6 @@
# Link preconnect is disabled on pre-High Sierra because the CFNetwork SPI is missing.
[ Sierra ] http/tests/preconnect [ Skip ]
-webkit.org/b/171839 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html [ Pass Failure ]
-
webkit.org/b/177687 http/tests/inspector/network/resource-sizes-memory-cache.html [ Pass Failure ]
webkit.org/b/178472 http/tests/resourceLoadStatistics/prevalent-resource-handled-keydown.html [ Skip ]
@@ -906,8 +889,6 @@
webkit.org/b/187828 [ Release ] fast/css-grid-layout/flex-content-sized-columns-resize.html [ Pass ImageOnlyFailure ]
-webkit.org/b/198661 scrollingcoordinator/mac/nested-sticky.html [ Pass ImageOnlyFailure Timeout ]
-
webkit.org/b/198663 http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access.html [ Pass Timeout ]
webkit.org/b/176030 [ Debug ] http/tests/websocket/tests/hybi/send-object-tostring-check.html [ Pass Failure ]
@@ -914,8 +895,6 @@
webkit.org/b/198921 [ Mojave+ ] webgpu/blend-color-triangle-strip.html [ Pass ImageOnlyFailure ]
-webkit.org/b/195635 scrollingcoordinator/mac/multiple-fixed.html [ Pass Timeout ]
-
webkit.org/b/199651 [ Mojave Debug ] webgpu/whlsl/builtin-vectors-2.html [ Slow ]
webkit.org/b/199089 [ Mojave+ Debug ] plugins/window-open.html [ Skip ]
@@ -935,8 +914,6 @@
webkit.org/b/206708 fast/animation/request-animation-frame-iframe.html [ Pass Failure ]
-webkit.org/b/206940 [ Mojave+ ] tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html [ Pass Failure ]
-
webkit.org/b/206961 [ Mojave ] media/media-fragments/TC0035.html [ Pass Failure ]
webkit.org/b/207003 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html [ Pass Failure ]
@@ -949,8 +926,6 @@
webkit.org/b/207117 webgpu/whlsl/nested-loop.html [ Pass ImageOnlyFailure ]
-webkit.org/b/207120 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-then-proximity.html [ Pass Failure ]
-
webkit.org/b/207127 webgpu/whlsl/buffer-vertex.html [ Pass ImageOnlyFailure ]
webkit.org/b/206903 inspector/heap/getRemoteObject.html [ Pass Crash ]
@@ -1037,18 +1012,10 @@
webkit.org/b/207844 storage/indexeddb/detached-iframe.html [ Pass Failure ]
-webkit.org/b/207848 [ Release ] fast/scrolling/latching/scroll-iframe-fragment.html [ Pass Failure ]
-
-webkit.org/b/207861 [ Release ] tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html [ Pass Failure ]
-
-webkit.org/b/148405 [ Release ] tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html [ Pass Failure ]
-
webkit.org/b/207864 webgpu/whlsl/do-while-loop-continue.html [ Pass ImageOnlyFailure ]
webkit.org/b/207938 http/wpt/crypto/derive-hmac-key-crash.any.html [ Pass Crash ]
-webkit.org/b/207953 [ Release ] fast/scrolling/latching/scroll-iframe-in-overflow.html [ Pass Failure ]
-
webkit.org/b/207954 http/tests/inspector/network/har/har-page.html [ Pass Failure ]
webkit.org/b/207962 accessibility/mac/aria-menu-item-selected-notification.html [ Slow ]
@@ -1081,8 +1048,6 @@
webkit.org/b/209006 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html [ Pass Failure ]
-webkit.org/b/209013 fast/scrolling/momentum-scroll-with-borders.html [ Pass Timeout ]
-
webkit.org/b/209018 [ Catalina ] webrtc/video-autoplay1.html [ Pass Failure ]
webkit.org/b/209024 [ Debug ] webgpu/whlsl/vector-compare.html [ Pass Crash ]
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2020-03-19 16:03:04 UTC (rev 258701)
@@ -1,62 +1,20 @@
Put mouse here and flick downwards
Scrollable Region
-Count DATA Rev Count
-TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP
-1 0.1100 40
-2 0.1155 39
-3 0.2200 38
-4 0.2255 37
-5 0.3300 36
-6 0.3355 35
-7 0.4400 34
-8 0.4455 33
-9 0.5500 32
-10 0.5555 31
-11 0.6600 30
-12 0.6655 29
-13 0.7700 28
-14 0.7755 27
-15 0.8800 26
-16 0.8855 25
-17 0.9900 24
-18 0.9955 23
-19 0.9999 22
-20 1.0000 21
-21 1.0000 20
-22 0.9999 19
-23 0.9955 18
-24 0.9900 17
-25 0.8855 16
-26 0.8800 15
-27 0.7755 14
-28 0.7700 13
-29 0.6655 12
-30 0.6600 11
-31 0.5555 10
-32 0.5500 9
-33 0.4455 8
-34 0.4400 7
-35 0.3355 6
-36 0.3300 5
-37 0.2255 4
-38 0.2200 3
-39 0.1155 2
-40 0.1100 1
-END END END END END END END END END END END END END END END
+Scrolled content
Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+Mouse moved to (28, 125)
+PASS Scrollable div did not receive wheel events.
PASS successfullyParsed is true
TEST COMPLETE
-Mouse moved to (28, 125)
-PASS Scrollable div did not receive wheel events.
(GraphicsLayer
(anchor 0.00 0.00)
- (bounds 2008.00 2281.00)
+ (bounds 2008.00 2236.00)
(visible rect 0.00, 70.00 785.00 x 585.00)
(coverage rect 0.00, 70.00 785.00 x 585.00)
(intersects coverage rect 1)
@@ -63,7 +21,7 @@
(contentsScale 1.00)
(children 1
(GraphicsLayer
- (bounds 2008.00 2281.00)
+ (bounds 2008.00 2236.00)
(contentsOpaque 1)
(visible rect 0.00, 70.00 785.00 x 585.00)
(coverage rect 0.00, 0.00 1570.00 x 1755.00)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2020-03-19 16:03:04 UTC (rev 258701)
@@ -14,6 +14,7 @@
(min layout viewport origin (0,0))
(max layout viewport origin (0,1636))
(behavior for fixed 0)
+ (visual viewport smaller than layout viewport 1)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
@@ -87,7 +88,7 @@
(drawsContent 1)
(visible rect 0.00, 0.00 0.00 x 0.00)
(coverage rect -597.00, -196.00 341.30 x 254.35)
- (intersects coverage rect 1)
+ (intersects coverage rect 0)
(contentsScale 2.30)
)
(GraphicsLayer
@@ -97,7 +98,7 @@
(drawsContent 1)
(visible rect 0.00, 0.00 0.00 x 0.00)
(coverage rect 4.00, -497.00 341.30 x 254.35)
- (intersects coverage rect 1)
+ (intersects coverage rect 0)
(contentsScale 2.30)
)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt 2020-03-19 16:03:04 UTC (rev 258701)
@@ -1,10 +1,16 @@
(Frame scrolling node
(scrollable area size 800 600)
(contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 1)
+ (vertical scrollbar mode 1))
(layout viewport at (0,0) size 800x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,0))
(synchronous event dispatch region for event wheel
at (0,0) size 800x594)
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt 2020-03-19 16:03:04 UTC (rev 258701)
@@ -1,10 +1,16 @@
(Frame scrolling node
(scrollable area size 800 600)
(contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 1)
+ (vertical scrollbar mode 1))
(layout viewport at (0,0) size 800x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,0))
(synchronous event dispatch region for event wheel
at (0,166) size 280x434)
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -18,7 +18,7 @@
margin: 2px;
}
</style>
- <script src=""
+ <script src=""
<script>
window.jsTestIsAsync = true;
@@ -58,7 +58,7 @@
testPassed("div honored snap points.");
if (targetLabel == 'horizontalTarget')
- setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
+ setTimeout(() => { scrollGlideTest('verticalTarget') }, 0);
else
finishJSTest();
}
@@ -82,23 +82,24 @@
var startPosX = windowPosition.x + 0.5 * iframeTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * iframeTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
- eventSender.callAfterScrollingCompletes(function() { return checkForScrollSnap(targetLabel); });
+ eventSender.callAfterScrollingCompletes(() => { return checkForScrollSnap(targetLabel); });
}
function checkForScrollGlide(targetLabel)
{
var iframeTarget = document.getElementById(targetLabel);
- var iframeBody = window.frames[targetLabel].document.body;
+ var iframeScrollingElement = window.frames[targetLabel].contentDocument.scrollingElement;
- var actualPosition = iframeBody.scrollTop;
+ var actualPosition = iframeScrollingElement.scrollTop;
var expectedPosition = iframeTarget.clientHeight;
if (targetLabel == 'horizontalTarget') {
- actualPosition = iframeBody.scrollLeft;
+ actualPosition = iframeScrollingElement.scrollLeft;
expectedPosition = iframeTarget.clientWidth;
}
@@ -108,7 +109,7 @@
else
testFailed("div did not honor snap points. Expected " + expectedPosition + ", but got " + actualPosition);
- setTimeout(function() { scrollSnapTest(targetLabel) }, 0);
+ setTimeout(() => { scrollSnapTest(targetLabel) }, 0);
}
function scrollGlideTest(targetLabel)
@@ -115,15 +116,15 @@
{
debug("Testing scroll-snap glide for " + targetLabel + ":");
var iframeTarget = document.getElementById(targetLabel);
- var iframeBody = window.frames[targetLabel].document.body;
+ var iframeScrollingElement = window.frames[targetLabel].contentDocument.scrollingElement;
var dx = 0;
var dy = 0;
if (targetLabel == 'horizontalTarget') {
- iframeScrollPositionBeforeGlide = iframeBody.scrollLeft;
+ iframeScrollPositionBeforeGlide = iframeScrollingElement.scrollLeft;
dx = -1;
} else {
- iframeScrollPositionBeforeGlide = iframeBody.scrollTop;
+ iframeScrollPositionBeforeGlide = iframeScrollingElement.scrollTop;
dy = -1;
}
@@ -131,6 +132,7 @@
var startPosX = windowPosition.x + 0.5 * iframeTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * iframeTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -140,13 +142,12 @@
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'none', 'begin');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'none', 'continue');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
- eventSender.callAfterScrollingCompletes(function() { return checkForScrollGlide(targetLabel); });
+ eventSender.callAfterScrollingCompletes(() => { return checkForScrollGlide(targetLabel) });
}
function onLoad()
{
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
}
@@ -160,5 +161,6 @@
<iframe id="verticalTarget" class="verticalGallery" src="" style="height: 300px; width: 300px"></iframe>
<div id="console"></div>
</div>
+ <script src=""
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -26,14 +26,15 @@
<script>
window.jsTestIsAsync = true;
- var divTarget;
- var divScrollPositionBeforeGlide;
- var divScrollPositionBeforeSnap;
+ var targetScroller;
+ var scrollPositionBeforeGlide;
+ var scrollPositionBeforeSnap;
- function checkForScrollSnap() {
+ function checkForScrollSnap()
+ {
// The div should have snapped back to the previous position
- if (divTarget.scrollLeft != divScrollPositionBeforeSnap)
- testFailed("div did not snap back to proper location. Expected " + divScrollPositionBeforeSnap + ", but got " + divTarget.scrollLeft);
+ if (targetScroller.scrollLeft != scrollPositionBeforeSnap)
+ testFailed("div did not snap back to proper location. Expected " + scrollPositionBeforeSnap + ", but got " + targetScroller.scrollLeft);
else
testPassed("div honored snap points.");
@@ -40,16 +41,13 @@
finishJSTest();
}
- function scrollSnapTest() {
- // See where our div lives:
- pageScrollPositionBefore = document.scrollingElement.scrollLeft;
+ function scrollSnapTest()
+ {
+ scrollPositionBeforeSnap = targetScroller.scrollLeft;
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeSnap = divTarget.scrollLeft;
-
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = targetScroller.offsetLeft + 20;
+ var startPosY = targetScroller.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
@@ -58,23 +56,24 @@
eventSender.callAfterScrollingCompletes(checkForScrollSnap);
}
- function checkForScrollGlide() {
+ function checkForScrollGlide()
+ {
// The div should have scrolled (glided) to the next snap point.
- if (divTarget.scrollLeft == window.innerWidth)
+ if (targetScroller.scrollLeft == window.innerWidth)
testPassed("div scrolled to next window.");
else
- testFailed("div did not honor snap points. Expected " + window.innerWidth + ", but got " + divTarget.scrollLeft);
+ testFailed("div did not honor snap points. Expected " + window.innerWidth + ", but got " + targetScroller.scrollLeft);
setTimeout(scrollSnapTest, 0);
}
- function scrollGlideTest() {
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeGlide = divTarget.scrollLeft;
+ function scrollGlideTest()
+ {
+ scrollPositionBeforeGlide = targetScroller.scrollLeft;
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = targetScroller.offsetLeft + 20;
+ var startPosY = targetScroller.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
@@ -87,10 +86,10 @@
eventSender.callAfterScrollingCompletes(checkForScrollGlide);
}
- function onLoad() {
-
+ function onLoad()
+ {
+ targetScroller = document.scrollingElement;
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(scrollGlideTest, 0);
} else {
@@ -109,7 +108,7 @@
}
</script>
</head>
- <body _onload_="onLoad();" class="horizontalGallery" id="target">
+ <body _onload_="onLoad();" class="horizontalGallery">
<div id="item0" class="colorBox"><div id="console"></div></div>
<div id="item1" class="colorBox"></div>
<div id="item2" class="colorBox"></div>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -26,14 +26,14 @@
<script>
window.jsTestIsAsync = true;
- var divTarget;
- var divScrollPositionBeforeGlide;
- var divScrollPositionBeforeSnap;
+ var scrollingTarget;
+ var scrollPositionBeforeGlide;
+ var scrollPositionBeforeSnap;
function checkForScrollSnap() {
// The div should have snapped back to the previous position
- if (divTarget.scrollLeft != divScrollPositionBeforeSnap)
- testFailed(`div did not snap back to proper location. ${divTarget.scrollLeft} vs. ${divScrollPositionBeforeSnap}`);
+ if (scrollingTarget.scrollLeft != scrollPositionBeforeSnap)
+ testFailed(`div did not snap back to proper location. ${scrollingTarget.scrollLeft} vs. ${scrollPositionBeforeSnap}`);
else
testPassed("div honored snap points.");
@@ -40,16 +40,13 @@
finishJSTest();
}
- function scrollSnapTest() {
- // See where our div lives:
- pageScrollPositionBefore = document.scrollingElement.scrollLeft;
+ function scrollSnapTest()
+ {
+ scrollPositionBeforeSnap = scrollingTarget.scrollLeft;
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeSnap = divTarget.scrollLeft;
-
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = scrollingTarget.offsetLeft + 20;
+ var startPosY = scrollingTarget.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
@@ -58,23 +55,24 @@
eventSender.callAfterScrollingCompletes(checkForScrollSnap);
}
- function checkForScrollGlide() {
+ function checkForScrollGlide()
+ {
// The div should have scrolled (glided) to the next snap point.
- if (divTarget.scrollLeft == window.innerWidth)
+ if (scrollingTarget.scrollLeft == window.innerWidth)
testPassed("div scrolled to next window.");
else
- testFailed(`div did not honor snap points. ${divTarget.scrollLeft} vs. ${window.innerWidth}`);
+ testFailed(`div did not honor snap points. ${scrollingTarget.scrollLeft} vs. ${window.innerWidth}`);
setTimeout(scrollSnapTest, 0);
}
- function scrollGlideTest() {
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeGlide = divTarget.scrollLeft;
+ function scrollGlideTest()
+ {
+ scrollPositionBeforeGlide = scrollingTarget.scrollLeft;
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = scrollingTarget.offsetLeft + 20;
+ var startPosY = scrollingTarget.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
@@ -87,10 +85,10 @@
eventSender.callAfterScrollingCompletes(checkForScrollGlide);
}
- function onLoad() {
-
+ function onLoad()
+ {
+ scrollingTarget = document.scrollingElement;
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(scrollGlideTest, 0);
} else {
@@ -109,7 +107,7 @@
}
</script>
</head>
- <body _onload_="onLoad();" class="horizontalGallery" id="target">
+ <body _onload_="onLoad();" class="horizontalGallery">
<div id="item0" class="colorBox"><div id="console"></div></div>
<div id="item1" class="colorBox"></div>
<div id="item2" class="colorBox"></div>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -26,14 +26,15 @@
<script>
window.jsTestIsAsync = true;
- var divTarget;
- var divScrollPositionBeforeGlide;
- var divScrollPositionBeforeSnap;
+ var targetScroller;
+ var scrollPositionBeforeGlide;
+ var scrollPositionBeforeSnap;
- function checkForScrollSnap() {
+ function checkForScrollSnap()
+ {
// The div should have snapped back to the previous position
- if (divTarget.scrollTop != divScrollPositionBeforeSnap)
- testFailed(`div did not snap back to proper location. (${divTarget.scrollTop} vs. ${divScrollPositionBeforeSnap})`);
+ if (targetScroller.scrollTop != scrollPositionBeforeSnap)
+ testFailed(`div did not snap back to proper location. (${targetScroller.scrollTop} vs. ${scrollPositionBeforeSnap})`);
else
testPassed("div honored snap points.");
@@ -40,16 +41,14 @@
finishJSTest();
}
- function scrollSnapTest() {
+ function scrollSnapTest()
+ {
// See where our div lives:
- pageScrollPositionBefore = document.scrollingElement.scrollTop;
+ scrollPositionBeforeSnap = targetScroller.scrollTop;
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeSnap = divTarget.scrollTop;
-
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = targetScroller.offsetLeft + 20;
+ var startPosY = targetScroller.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
@@ -58,23 +57,24 @@
eventSender.callAfterScrollingCompletes(checkForScrollSnap);
}
- function checkForScrollGlide() {
+ function checkForScrollGlide()
+ {
// The div should have scrolled (glided) to the next snap point.
- if (divTarget.scrollTop == window.innerHeight)
+ if (targetScroller.scrollTop == window.innerHeight)
testPassed("div scrolled to next window.");
else
- testFailed(`div did not honor snap points. (${divTarget.scrollTop} vs. ${window.innerHeight})`);
+ testFailed(`div did not honor snap points. (${targetScroller.scrollTop} vs. ${window.innerHeight})`);
setTimeout(scrollSnapTest, 0);
}
- function scrollGlideTest() {
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeGlide = divTarget.scrollTop;
+ function scrollGlideTest()
+ {
+ scrollPositionBeforeGlide = targetScroller.scrollTop;
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = targetScroller.offsetLeft + 20;
+ var startPosY = targetScroller.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
@@ -87,9 +87,10 @@
eventSender.callAfterScrollingCompletes(checkForScrollGlide);
}
- function onLoad() {
+ function onLoad()
+ {
+ targetScroller = document.scrollingElement;
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(scrollGlideTest, 0);
} else {
@@ -108,7 +109,7 @@
}
</script>
</head>
- <body _onload_="onLoad();" class="verticalGallery" id="target">
+ <body _onload_="onLoad();" class="verticalGallery">
<div id="item0" class="colorBox"><div id="console"></div></div>
<div id="item1" class="colorBox"></div>
<div id="item2" class="colorBox"></div>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -26,9 +26,11 @@
<script>
window.jsTestIsAsync = true;
- function scrollSnapTest() {
+ function scrollSnapTest()
+ {
var startPosX = document.body.offsetLeft + 20;
var startPosY = document.body.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
@@ -49,9 +51,9 @@
});
}
- function onLoad() {
+ function onLoad()
+ {
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(scrollSnapTest, 0);
} else {
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -26,14 +26,15 @@
<script>
window.jsTestIsAsync = true;
- var divTarget;
- var divScrollPositionBeforeGlide;
- var divScrollPositionBeforeSnap;
+ var scrollingTarget;
+ var scrollPositionBeforeGlide;
+ var scrollPositionBeforeSnap;
- function checkForScrollSnap() {
+ function checkForScrollSnap()
+ {
// The div should have snapped back to the previous position
- if (divTarget.scrollTop != divScrollPositionBeforeSnap)
- testFailed(`div did not snap back to proper location. (${divTarget.scrollTop} vs. ${divScrollPositionBeforeSnap})`);
+ if (scrollingTarget.scrollTop != scrollPositionBeforeSnap)
+ testFailed(`div did not snap back to proper location. (${scrollingTarget.scrollTop} vs. ${scrollPositionBeforeSnap})`);
else
testPassed("div honored snap points.");
@@ -40,16 +41,13 @@
finishJSTest();
}
- function scrollSnapTest() {
- // See where our div lives:
- pageScrollPositionBefore = document.scrollingElement.scrollTop;
+ function scrollSnapTest()
+ {
+ scrollPositionBeforeSnap = scrollingTarget.scrollTop;
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeSnap = divTarget.scrollTop;
-
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = scrollingTarget.offsetLeft + 20;
+ var startPosY = scrollingTarget.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
@@ -58,23 +56,24 @@
eventSender.callAfterScrollingCompletes(checkForScrollSnap);
}
- function checkForScrollGlide() {
+ function checkForScrollGlide()
+ {
// The div should have scrolled (glided) to the next snap point.
- if (divTarget.scrollTop == window.innerHeight)
+ if (scrollingTarget.scrollTop == window.innerHeight)
testPassed("div scrolled to next window.");
else
- testFailed(`div did not honor snap points. (${divTarget.scrollTop} vs. ${window.innerHeight})`);
+ testFailed(`div did not honor snap points. (${scrollingTarget.scrollTop} vs. ${window.innerHeight})`);
setTimeout(scrollSnapTest, 0);
}
- function scrollGlideTest() {
- divTarget = document.getElementById('target');
-
- divScrollPositionBeforeGlide = divTarget.scrollTop;
+ function scrollGlideTest()
+ {
+ scrollPositionBeforeGlide = scrollingTarget.scrollTop;
- var startPosX = divTarget.offsetLeft + 20;
- var startPosY = divTarget.offsetTop + 20;
+ var startPosX = scrollingTarget.offsetLeft + 20;
+ var startPosY = scrollingTarget.offsetTop + 20;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
@@ -87,10 +86,10 @@
eventSender.callAfterScrollingCompletes(checkForScrollGlide);
}
- function onLoad() {
-
+ function onLoad()
+ {
+ scrollingTarget = document.scrollingElement;
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(scrollGlideTest, 0);
} else {
@@ -109,7 +108,7 @@
}
</script>
</head>
- <body _onload_="onLoad();" class="verticalGallery" id="target">
+ <body _onload_="onLoad();" class="verticalGallery">
<div id="item0" class="colorBox"><div id="console"></div></div>
<div id="item1" class="colorBox"></div>
<div id="item2" class="colorBox"></div>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -104,6 +104,7 @@
var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -151,6 +152,7 @@
var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -166,7 +168,6 @@
function onLoad()
{
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -112,6 +112,7 @@
var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -161,6 +162,7 @@
var startPosX = windowPosition.x + divTarget.clientWidth - 10;
var startPosY = windowPosition.y + 50;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -176,7 +178,6 @@
function onLoad()
{
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html (258700 => 258701)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html 2020-03-19 15:34:06 UTC (rev 258700)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html 2020-03-19 16:03:04 UTC (rev 258701)
@@ -106,6 +106,7 @@
var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -153,6 +154,7 @@
var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
@@ -168,7 +170,6 @@
function onLoad()
{
if (window.eventSender) {
- eventSender.monitorWheelEvents();
internals.setPlatformMomentumScrollingPredictionEnabled(false);
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
