Changeset 258701 in webkit
- Timestamp:
- Mar 19, 2020 9:03:04 AM (4 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r258700 r258701 1 2020-03-19 Simon Fraser <simon.fraser@apple.com> 2 3 Many tests relying on eventSender.monitorWheelEvents() are no longer flaky 4 https://bugs.webkit.org/show_bug.cgi?id=209272 5 6 Reviewed by Wenson Hsieh. 7 8 Remove tests from TestExpectations that were flakey because of bug 197819. 9 10 Fix some scroll-snap tests which were written before CSS OM View changes made document.body 11 not the scrolling element. 12 13 * platform/mac-wk2/TestExpectations: 14 * platform/mac/TestExpectations: 15 * tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt: 16 * tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt: 17 * tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt: 18 * tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt: 19 * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html: 20 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html: 21 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html: 22 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html: 23 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html: 24 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html: 25 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html: 26 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html: 27 * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html: 28 1 29 2020-03-19 Eric Carlson <eric.carlson@apple.com> 2 30 -
trunk/LayoutTests/platform/mac-wk2/TestExpectations
r258679 r258701 322 322 webkit.org/b/172544 [ Debug ] tiled-drawing/scrolling/fast-scroll-iframe-latched-mainframe-with-handler.html [ Pass Failure ] 323 323 324 webkit.org/b/136554 tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability.html [ Pass Failure ]325 webkit.org/b/139901 tiled-drawing/scrolling/frames/frameset-frame-scrollability.html [ Pass Failure ]326 327 webkit.org/b/167661 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html [ Pass Failure ]328 webkit.org/b/148407 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html [ Pass Failure ]329 webkit.org/b/148407 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html [ Pass Failure ]330 webkit.org/b/165196 tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html [ Pass Failure ]331 webkit.org/b/196115 tiled-drawing/scrolling/scroll-snap/scroll-snap-proximity-mainframe.html [ Skip ]332 333 webkit.org/b/148408 tiled-drawing/scrolling/root-overflow-with-mousewheel.html [ Pass Failure Timeout ]334 335 324 webkit.org/b/139820 fast/frames/lots-of-objects.html [ Pass Timeout ] 336 325 webkit.org/b/139820 fast/frames/lots-of-iframes.html [ Pass Timeout ] … … 592 581 webkit.org/b/161742 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/keyorder.htm [ Pass Failure ] 593 582 594 webkit.org/b/161547 [ Debug ] tiled-drawing/scrolling/fixed/four-bars-zoomed.html [ Pass Failure ]595 webkit.org/b/188096 [ Release ] tiled-drawing/scrolling/fixed/four-bars-zoomed.html [ Pass Failure ]596 597 598 583 webkit.org/b/162081 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ] 599 584 webkit.org/b/162081 editing/inserting/smart-quote-with-all-configurations.html [ Failure ] … … 763 748 # Link preconnect is disabled on pre-High Sierra because the CFNetwork SPI is missing. 764 749 [ Sierra ] http/tests/preconnect [ Skip ] 765 766 webkit.org/b/171839 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html [ Pass Failure ]767 750 768 751 webkit.org/b/177687 http/tests/inspector/network/resource-sizes-memory-cache.html [ Pass Failure ] … … 907 890 webkit.org/b/187828 [ Release ] fast/css-grid-layout/flex-content-sized-columns-resize.html [ Pass ImageOnlyFailure ] 908 891 909 webkit.org/b/198661 scrollingcoordinator/mac/nested-sticky.html [ Pass ImageOnlyFailure Timeout ]910 911 892 webkit.org/b/198663 http/tests/storageAccess/request-and-grant-access-then-navigate-same-site-should-have-access.html [ Pass Timeout ] 912 893 … … 914 895 915 896 webkit.org/b/198921 [ Mojave+ ] webgpu/blend-color-triangle-strip.html [ Pass ImageOnlyFailure ] 916 917 webkit.org/b/195635 scrollingcoordinator/mac/multiple-fixed.html [ Pass Timeout ]918 897 919 898 webkit.org/b/199651 [ Mojave Debug ] webgpu/whlsl/builtin-vectors-2.html [ Slow ] … … 936 915 webkit.org/b/206708 fast/animation/request-animation-frame-iframe.html [ Pass Failure ] 937 916 938 webkit.org/b/206940 [ Mojave+ ] tiled-drawing/scrolling/fast-scroll-select-latched-mainframe-with-handler.html [ Pass Failure ]939 940 917 webkit.org/b/206961 [ Mojave ] media/media-fragments/TC0035.html [ Pass Failure ] 941 918 … … 950 927 webkit.org/b/207117 webgpu/whlsl/nested-loop.html [ Pass ImageOnlyFailure ] 951 928 952 webkit.org/b/207120 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-then-proximity.html [ Pass Failure ]953 954 929 webkit.org/b/207127 webgpu/whlsl/buffer-vertex.html [ Pass ImageOnlyFailure ] 955 930 … … 1038 1013 webkit.org/b/207844 storage/indexeddb/detached-iframe.html [ Pass Failure ] 1039 1014 1040 webkit.org/b/207848 [ Release ] fast/scrolling/latching/scroll-iframe-fragment.html [ Pass Failure ]1041 1042 webkit.org/b/207861 [ Release ] tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html [ Pass Failure ]1043 1044 webkit.org/b/148405 [ Release ] tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html [ Pass Failure ]1045 1046 1015 webkit.org/b/207864 webgpu/whlsl/do-while-loop-continue.html [ Pass ImageOnlyFailure ] 1047 1016 1048 1017 webkit.org/b/207938 http/wpt/crypto/derive-hmac-key-crash.any.html [ Pass Crash ] 1049 1018 1050 webkit.org/b/207953 [ Release ] fast/scrolling/latching/scroll-iframe-in-overflow.html [ Pass Failure ]1051 1052 1019 webkit.org/b/207954 http/tests/inspector/network/har/har-page.html [ Pass Failure ] 1053 1020 … … 1081 1048 1082 1049 webkit.org/b/209006 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/085.html [ Pass Failure ] 1083 1084 webkit.org/b/209013 fast/scrolling/momentum-scroll-with-borders.html [ Pass Timeout ]1085 1050 1086 1051 webkit.org/b/209018 [ Catalina ] webrtc/video-autoplay1.html [ Pass Failure ] -
trunk/LayoutTests/platform/mac/TestExpectations
r258674 r258701 1758 1758 webkit.org/b/190882 [ Mojave+ ] animations/change-one-anim.html [ Pass Failure ] 1759 1759 1760 webkit.org/b/195635 scrollingcoordinator/mac/multiple-fixed.html [ Pass Timeout ]1761 1762 1760 # <rdar://problem/48781098> 1763 1761 [ Catalina+ ] fast/images/animated-heics-draw.html [ Pass ] -
trunk/LayoutTests/tiled-drawing/scrolling/fast-scroll-div-latched-mainframe-with-handler-expected.txt
r211662 r258701 2 2 Scrollable Region 3 3 4 Count DATA Rev Count 5 TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP 6 1 0.1100 40 7 2 0.1155 39 8 3 0.2200 38 9 4 0.2255 37 10 5 0.3300 36 11 6 0.3355 35 12 7 0.4400 34 13 8 0.4455 33 14 9 0.5500 32 15 10 0.5555 31 16 11 0.6600 30 17 12 0.6655 29 18 13 0.7700 28 19 14 0.7755 27 20 15 0.8800 26 21 16 0.8855 25 22 17 0.9900 24 23 18 0.9955 23 24 19 0.9999 22 25 20 1.0000 21 26 21 1.0000 20 27 22 0.9999 19 28 23 0.9955 18 29 24 0.9900 17 30 25 0.8855 16 31 26 0.8800 15 32 27 0.7755 14 33 28 0.7700 13 34 29 0.6655 12 35 30 0.6600 11 36 31 0.5555 10 37 32 0.5500 9 38 33 0.4455 8 39 34 0.4400 7 40 35 0.3355 6 41 36 0.3300 5 42 37 0.2255 4 43 38 0.2200 3 44 39 0.1155 2 45 40 0.1100 1 46 END END END END END END END END END END END END END END END 4 Scrolled content 47 5 Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame. 48 6 … … 50 8 51 9 10 Mouse moved to (28, 125) 11 PASS Scrollable div did not receive wheel events. 52 12 PASS successfullyParsed is true 53 13 54 14 TEST COMPLETE 55 Mouse moved to (28, 125)56 PASS Scrollable div did not receive wheel events.57 15 (GraphicsLayer 58 16 (anchor 0.00 0.00) 59 (bounds 2008.00 22 81.00)17 (bounds 2008.00 2236.00) 60 18 (visible rect 0.00, 70.00 785.00 x 585.00) 61 19 (coverage rect 0.00, 70.00 785.00 x 585.00) … … 64 22 (children 1 65 23 (GraphicsLayer 66 (bounds 2008.00 22 81.00)24 (bounds 2008.00 2236.00) 67 25 (contentsOpaque 1) 68 26 (visible rect 0.00, 70.00 785.00 x 585.00) -
trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt
r241934 r258701 15 15 (max layout viewport origin (0,1636)) 16 16 (behavior for fixed 0) 17 (visual viewport smaller than layout viewport 1) 17 18 (children 4 18 19 (Fixed node … … 88 89 (visible rect 0.00, 0.00 0.00 x 0.00) 89 90 (coverage rect -597.00, -196.00 341.30 x 254.35) 90 (intersects coverage rect 1)91 (intersects coverage rect 0) 91 92 (contentsScale 2.30) 92 93 ) … … 98 99 (visible rect 0.00, 0.00 0.00 x 0.00) 99 100 (coverage rect 4.00, -497.00 341.30 x 254.35) 100 (intersects coverage rect 1)101 (intersects coverage rect 0) 101 102 (contentsScale 2.30) 102 103 ) -
trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-frame-scrollability-expected.txt
r209409 r258701 2 2 (scrollable area size 800 600) 3 3 (contents size 800 600) 4 (scrollable area parameters 5 (horizontal scroll elasticity 2) 6 (vertical scroll elasticity 2) 7 (horizontal scrollbar mode 1) 8 (vertical scrollbar mode 1)) 4 9 (layout viewport at (0,0) size 800x600) 5 10 (min layout viewport origin (0,0)) … … 7 12 (synchronous event dispatch region for event wheel 8 13 at (0,0) size 800x594) 14 (behavior for fixed 0) 9 15 ) 10 16 -
trunk/LayoutTests/tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability-expected.txt
r209409 r258701 2 2 (scrollable area size 800 600) 3 3 (contents size 800 600) 4 (scrollable area parameters 5 (horizontal scroll elasticity 2) 6 (vertical scroll elasticity 2) 7 (horizontal scrollbar mode 1) 8 (vertical scrollbar mode 1)) 4 9 (layout viewport at (0,0) size 800x600) 5 10 (min layout viewport origin (0,0)) … … 7 12 (synchronous event dispatch region for event wheel 8 13 at (0,166) size 280x434) 14 (behavior for fixed 0) 9 15 ) 10 16 -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html
r210560 r258701 19 19 } 20 20 </style> 21 <script src="../../../resources/js-test .js"></script>21 <script src="../../../resources/js-test-pre.js"></script> 22 22 <script> 23 23 window.jsTestIsAsync = true; … … 59 59 60 60 if (targetLabel == 'horizontalTarget') 61 setTimeout( function(){ scrollGlideTest('verticalTarget') }, 0);61 setTimeout(() => { scrollGlideTest('verticalTarget') }, 0); 62 62 else 63 63 finishJSTest(); … … 83 83 var startPosX = windowPosition.x + 0.5 * iframeTarget.clientWidth; 84 84 var startPosY = windowPosition.y + 0.5 * iframeTarget.clientHeight; 85 eventSender.monitorWheelEvents(); 85 86 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 86 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 88 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none'); 89 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 90 eventSender.callAfterScrollingCompletes( function(){ return checkForScrollSnap(targetLabel); });91 eventSender.callAfterScrollingCompletes(() => { return checkForScrollSnap(targetLabel); }); 91 92 } 92 93 … … 94 95 { 95 96 var iframeTarget = document.getElementById(targetLabel); 96 var iframe Body = window.frames[targetLabel].document.body;97 var iframeScrollingElement = window.frames[targetLabel].contentDocument.scrollingElement; 97 98 98 var actualPosition = iframe Body.scrollTop;99 var actualPosition = iframeScrollingElement.scrollTop; 99 100 var expectedPosition = iframeTarget.clientHeight; 100 101 if (targetLabel == 'horizontalTarget') { 101 actualPosition = iframe Body.scrollLeft;102 actualPosition = iframeScrollingElement.scrollLeft; 102 103 expectedPosition = iframeTarget.clientWidth; 103 104 } … … 109 110 testFailed("div did not honor snap points. Expected " + expectedPosition + ", but got " + actualPosition); 110 111 111 setTimeout( function(){ scrollSnapTest(targetLabel) }, 0);112 setTimeout(() => { scrollSnapTest(targetLabel) }, 0); 112 113 } 113 114 … … 116 117 debug("Testing scroll-snap glide for " + targetLabel + ":"); 117 118 var iframeTarget = document.getElementById(targetLabel); 118 var iframe Body = window.frames[targetLabel].document.body;119 var iframeScrollingElement = window.frames[targetLabel].contentDocument.scrollingElement; 119 120 120 121 var dx = 0; 121 122 var dy = 0; 122 123 if (targetLabel == 'horizontalTarget') { 123 iframeScrollPositionBeforeGlide = iframe Body.scrollLeft;124 iframeScrollPositionBeforeGlide = iframeScrollingElement.scrollLeft; 124 125 dx = -1; 125 126 } else { 126 iframeScrollPositionBeforeGlide = iframe Body.scrollTop;127 iframeScrollPositionBeforeGlide = iframeScrollingElement.scrollTop; 127 128 dy = -1; 128 129 } … … 132 133 var startPosX = windowPosition.x + 0.5 * iframeTarget.clientWidth; 133 134 var startPosY = windowPosition.y + 0.5 * iframeTarget.clientHeight; 135 eventSender.monitorWheelEvents(); 134 136 eventSender.mouseMoveTo(startPosX, startPosY); 135 137 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 141 143 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'none', 'continue'); 142 144 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 143 eventSender.callAfterScrollingCompletes( function() { return checkForScrollGlide(targetLabel);});145 eventSender.callAfterScrollingCompletes(() => { return checkForScrollGlide(targetLabel) }); 144 146 } 145 147 … … 147 149 { 148 150 if (window.eventSender) { 149 eventSender.monitorWheelEvents();150 151 internals.setPlatformMomentumScrollingPredictionEnabled(false); 151 152 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0); … … 161 162 <div id="console"></div> 162 163 </div> 164 <script src="../../../resources/js-test-post.js"></script> 163 165 </body> 164 166 </html> -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html
r235893 r258701 27 27 window.jsTestIsAsync = true; 28 28 29 var divTarget;30 var divScrollPositionBeforeGlide;31 var divScrollPositionBeforeSnap;29 var targetScroller; 30 var scrollPositionBeforeGlide; 31 var scrollPositionBeforeSnap; 32 32 33 function checkForScrollSnap() { 33 function checkForScrollSnap() 34 { 34 35 // The div should have snapped back to the previous position 35 if ( divTarget.scrollLeft != divScrollPositionBeforeSnap)36 testFailed("div did not snap back to proper location. Expected " + divScrollPositionBeforeSnap + ", but got " + divTarget.scrollLeft);36 if (targetScroller.scrollLeft != scrollPositionBeforeSnap) 37 testFailed("div did not snap back to proper location. Expected " + scrollPositionBeforeSnap + ", but got " + targetScroller.scrollLeft); 37 38 else 38 39 testPassed("div honored snap points."); … … 41 42 } 42 43 43 function scrollSnapTest() {44 // See where our div lives:45 pageScrollPositionBefore = document.scrollingElement.scrollLeft;44 function scrollSnapTest() 45 { 46 scrollPositionBeforeSnap = targetScroller.scrollLeft; 46 47 47 divTarget = document.getElementById('target'); 48 49 divScrollPositionBeforeSnap = divTarget.scrollLeft; 50 51 var startPosX = divTarget.offsetLeft + 20; 52 var startPosY = divTarget.offsetTop + 20; 48 var startPosX = targetScroller.offsetLeft + 20; 49 var startPosY = targetScroller.offsetTop + 20; 50 eventSender.monitorWheelEvents(); 53 51 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 54 52 eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none'); … … 59 57 } 60 58 61 function checkForScrollGlide() { 59 function checkForScrollGlide() 60 { 62 61 // The div should have scrolled (glided) to the next snap point. 63 if ( divTarget.scrollLeft == window.innerWidth)62 if (targetScroller.scrollLeft == window.innerWidth) 64 63 testPassed("div scrolled to next window."); 65 64 else 66 testFailed("div did not honor snap points. Expected " + window.innerWidth + ", but got " + divTarget.scrollLeft);65 testFailed("div did not honor snap points. Expected " + window.innerWidth + ", but got " + targetScroller.scrollLeft); 67 66 68 67 setTimeout(scrollSnapTest, 0); 69 68 } 70 69 71 function scrollGlideTest() { 72 divTarget = document.getElementById('target'); 73 74 divScrollPositionBeforeGlide = divTarget.scrollLeft; 70 function scrollGlideTest() 71 { 72 scrollPositionBeforeGlide = targetScroller.scrollLeft; 75 73 76 var startPosX = divTarget.offsetLeft + 20; 77 var startPosY = divTarget.offsetTop + 20; 74 var startPosX = targetScroller.offsetLeft + 20; 75 var startPosY = targetScroller.offsetTop + 20; 76 eventSender.monitorWheelEvents(); 78 77 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 79 78 eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none'); … … 88 87 } 89 88 90 function onLoad() { 91 89 function onLoad() 90 { 91 targetScroller = document.scrollingElement; 92 92 if (window.eventSender) { 93 eventSender.monitorWheelEvents();94 93 internals.setPlatformMomentumScrollingPredictionEnabled(false); 95 94 setTimeout(scrollGlideTest, 0); … … 110 109 </script> 111 110 </head> 112 <body onload="onLoad();" class="horizontalGallery" id="target">111 <body onload="onLoad();" class="horizontalGallery"> 113 112 <div id="item0" class="colorBox"><div id="console"></div></div> 114 113 <div id="item1" class="colorBox"></div> -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html
r235893 r258701 27 27 window.jsTestIsAsync = true; 28 28 29 var divTarget;30 var divScrollPositionBeforeGlide;31 var divScrollPositionBeforeSnap;29 var scrollingTarget; 30 var scrollPositionBeforeGlide; 31 var scrollPositionBeforeSnap; 32 32 33 33 function checkForScrollSnap() { 34 34 // The div should have snapped back to the previous position 35 if ( divTarget.scrollLeft != divScrollPositionBeforeSnap)36 testFailed(`div did not snap back to proper location. ${ divTarget.scrollLeft} vs. ${divScrollPositionBeforeSnap}`);35 if (scrollingTarget.scrollLeft != scrollPositionBeforeSnap) 36 testFailed(`div did not snap back to proper location. ${scrollingTarget.scrollLeft} vs. ${scrollPositionBeforeSnap}`); 37 37 else 38 38 testPassed("div honored snap points."); … … 41 41 } 42 42 43 function scrollSnapTest() {44 // See where our div lives:45 pageScrollPositionBefore = document.scrollingElement.scrollLeft;43 function scrollSnapTest() 44 { 45 scrollPositionBeforeSnap = scrollingTarget.scrollLeft; 46 46 47 divTarget = document.getElementById('target'); 48 49 divScrollPositionBeforeSnap = divTarget.scrollLeft; 50 51 var startPosX = divTarget.offsetLeft + 20; 52 var startPosY = divTarget.offsetTop + 20; 47 var startPosX = scrollingTarget.offsetLeft + 20; 48 var startPosY = scrollingTarget.offsetTop + 20; 49 eventSender.monitorWheelEvents(); 53 50 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 54 51 eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none'); … … 59 56 } 60 57 61 function checkForScrollGlide() { 58 function checkForScrollGlide() 59 { 62 60 // The div should have scrolled (glided) to the next snap point. 63 if ( divTarget.scrollLeft == window.innerWidth)61 if (scrollingTarget.scrollLeft == window.innerWidth) 64 62 testPassed("div scrolled to next window."); 65 63 else 66 testFailed(`div did not honor snap points. ${ divTarget.scrollLeft} vs. ${window.innerWidth}`);64 testFailed(`div did not honor snap points. ${scrollingTarget.scrollLeft} vs. ${window.innerWidth}`); 67 65 68 66 setTimeout(scrollSnapTest, 0); 69 67 } 70 68 71 function scrollGlideTest() { 72 divTarget = document.getElementById('target'); 73 74 divScrollPositionBeforeGlide = divTarget.scrollLeft; 69 function scrollGlideTest() 70 { 71 scrollPositionBeforeGlide = scrollingTarget.scrollLeft; 75 72 76 var startPosX = divTarget.offsetLeft + 20; 77 var startPosY = divTarget.offsetTop + 20; 73 var startPosX = scrollingTarget.offsetLeft + 20; 74 var startPosY = scrollingTarget.offsetTop + 20; 75 eventSender.monitorWheelEvents(); 78 76 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 79 77 eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none'); … … 88 86 } 89 87 90 function onLoad() { 91 88 function onLoad() 89 { 90 scrollingTarget = document.scrollingElement; 92 91 if (window.eventSender) { 93 eventSender.monitorWheelEvents();94 92 internals.setPlatformMomentumScrollingPredictionEnabled(false); 95 93 setTimeout(scrollGlideTest, 0); … … 110 108 </script> 111 109 </head> 112 <body onload="onLoad();" class="horizontalGallery" id="target">110 <body onload="onLoad();" class="horizontalGallery"> 113 111 <div id="item0" class="colorBox"><div id="console"></div></div> 114 112 <div id="item1" class="colorBox"></div> -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html
r235893 r258701 27 27 window.jsTestIsAsync = true; 28 28 29 var divTarget;30 var divScrollPositionBeforeGlide;31 var divScrollPositionBeforeSnap;29 var targetScroller; 30 var scrollPositionBeforeGlide; 31 var scrollPositionBeforeSnap; 32 32 33 function checkForScrollSnap() { 33 function checkForScrollSnap() 34 { 34 35 // The div should have snapped back to the previous position 35 if ( divTarget.scrollTop != divScrollPositionBeforeSnap)36 testFailed(`div did not snap back to proper location. (${ divTarget.scrollTop} vs. ${divScrollPositionBeforeSnap})`);36 if (targetScroller.scrollTop != scrollPositionBeforeSnap) 37 testFailed(`div did not snap back to proper location. (${targetScroller.scrollTop} vs. ${scrollPositionBeforeSnap})`); 37 38 else 38 39 testPassed("div honored snap points."); … … 41 42 } 42 43 43 function scrollSnapTest() { 44 function scrollSnapTest() 45 { 44 46 // See where our div lives: 45 pageScrollPositionBefore = document.scrollingElement.scrollTop;47 scrollPositionBeforeSnap = targetScroller.scrollTop; 46 48 47 divTarget = document.getElementById('target'); 48 49 divScrollPositionBeforeSnap = divTarget.scrollTop; 50 51 var startPosX = divTarget.offsetLeft + 20; 52 var startPosY = divTarget.offsetTop + 20; 49 var startPosX = targetScroller.offsetLeft + 20; 50 var startPosY = targetScroller.offsetTop + 20; 51 eventSender.monitorWheelEvents(); 53 52 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 54 53 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); … … 59 58 } 60 59 61 function checkForScrollGlide() { 60 function checkForScrollGlide() 61 { 62 62 // The div should have scrolled (glided) to the next snap point. 63 if ( divTarget.scrollTop == window.innerHeight)63 if (targetScroller.scrollTop == window.innerHeight) 64 64 testPassed("div scrolled to next window."); 65 65 else 66 testFailed(`div did not honor snap points. (${ divTarget.scrollTop} vs. ${window.innerHeight})`);66 testFailed(`div did not honor snap points. (${targetScroller.scrollTop} vs. ${window.innerHeight})`); 67 67 68 68 setTimeout(scrollSnapTest, 0); 69 69 } 70 70 71 function scrollGlideTest() { 72 divTarget = document.getElementById('target'); 73 74 divScrollPositionBeforeGlide = divTarget.scrollTop; 71 function scrollGlideTest() 72 { 73 scrollPositionBeforeGlide = targetScroller.scrollTop; 75 74 76 var startPosX = divTarget.offsetLeft + 20; 77 var startPosY = divTarget.offsetTop + 20; 75 var startPosX = targetScroller.offsetLeft + 20; 76 var startPosY = targetScroller.offsetTop + 20; 77 eventSender.monitorWheelEvents(); 78 78 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 79 79 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); … … 88 88 } 89 89 90 function onLoad() { 90 function onLoad() 91 { 92 targetScroller = document.scrollingElement; 91 93 if (window.eventSender) { 92 eventSender.monitorWheelEvents();93 94 internals.setPlatformMomentumScrollingPredictionEnabled(false); 94 95 setTimeout(scrollGlideTest, 0); … … 109 110 </script> 110 111 </head> 111 <body onload="onLoad();" class="verticalGallery" id="target">112 <body onload="onLoad();" class="verticalGallery"> 112 113 <div id="item0" class="colorBox"><div id="console"></div></div> 113 114 <div id="item1" class="colorBox"></div> -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-then-horizontal.html
r235893 r258701 27 27 window.jsTestIsAsync = true; 28 28 29 function scrollSnapTest() { 29 function scrollSnapTest() 30 { 30 31 var startPosX = document.body.offsetLeft + 20; 31 32 var startPosY = document.body.offsetTop + 20; 33 eventSender.monitorWheelEvents(); 32 34 eventSender.mouseMoveTo(startPosX, startPosY); 33 35 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); … … 50 52 } 51 53 52 function onLoad() { 54 function onLoad() 55 { 53 56 if (window.eventSender) { 54 eventSender.monitorWheelEvents();55 57 internals.setPlatformMomentumScrollingPredictionEnabled(false); 56 58 setTimeout(scrollSnapTest, 0); -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html
r235893 r258701 27 27 window.jsTestIsAsync = true; 28 28 29 var divTarget;30 var divScrollPositionBeforeGlide;31 var divScrollPositionBeforeSnap;29 var scrollingTarget; 30 var scrollPositionBeforeGlide; 31 var scrollPositionBeforeSnap; 32 32 33 function checkForScrollSnap() { 33 function checkForScrollSnap() 34 { 34 35 // The div should have snapped back to the previous position 35 if ( divTarget.scrollTop != divScrollPositionBeforeSnap)36 testFailed(`div did not snap back to proper location. (${ divTarget.scrollTop} vs. ${divScrollPositionBeforeSnap})`);36 if (scrollingTarget.scrollTop != scrollPositionBeforeSnap) 37 testFailed(`div did not snap back to proper location. (${scrollingTarget.scrollTop} vs. ${scrollPositionBeforeSnap})`); 37 38 else 38 39 testPassed("div honored snap points."); … … 41 42 } 42 43 43 function scrollSnapTest() {44 // See where our div lives:45 pageScrollPositionBefore = document.scrollingElement.scrollTop;44 function scrollSnapTest() 45 { 46 scrollPositionBeforeSnap = scrollingTarget.scrollTop; 46 47 47 divTarget = document.getElementById('target'); 48 49 divScrollPositionBeforeSnap = divTarget.scrollTop; 50 51 var startPosX = divTarget.offsetLeft + 20; 52 var startPosY = divTarget.offsetTop + 20; 48 var startPosX = scrollingTarget.offsetLeft + 20; 49 var startPosY = scrollingTarget.offsetTop + 20; 50 eventSender.monitorWheelEvents(); 53 51 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 54 52 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); … … 59 57 } 60 58 61 function checkForScrollGlide() { 59 function checkForScrollGlide() 60 { 62 61 // The div should have scrolled (glided) to the next snap point. 63 if ( divTarget.scrollTop == window.innerHeight)62 if (scrollingTarget.scrollTop == window.innerHeight) 64 63 testPassed("div scrolled to next window."); 65 64 else 66 testFailed(`div did not honor snap points. (${ divTarget.scrollTop} vs. ${window.innerHeight})`);65 testFailed(`div did not honor snap points. (${scrollingTarget.scrollTop} vs. ${window.innerHeight})`); 67 66 68 67 setTimeout(scrollSnapTest, 0); 69 68 } 70 69 71 function scrollGlideTest() { 72 divTarget = document.getElementById('target'); 73 74 divScrollPositionBeforeGlide = divTarget.scrollTop; 70 function scrollGlideTest() 71 { 72 scrollPositionBeforeGlide = scrollingTarget.scrollTop; 75 73 76 var startPosX = divTarget.offsetLeft + 20; 77 var startPosY = divTarget.offsetTop + 20; 74 var startPosX = scrollingTarget.offsetLeft + 20; 75 var startPosY = scrollingTarget.offsetTop + 20; 76 eventSender.monitorWheelEvents(); 78 77 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 79 78 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); … … 88 87 } 89 88 90 function onLoad() { 91 89 function onLoad() 90 { 91 scrollingTarget = document.scrollingElement; 92 92 if (window.eventSender) { 93 eventSender.monitorWheelEvents();94 93 internals.setPlatformMomentumScrollingPredictionEnabled(false); 95 94 setTimeout(scrollGlideTest, 0); … … 110 109 </script> 111 110 </head> 112 <body onload="onLoad();" class="verticalGallery" id="target">111 <body onload="onLoad();" class="verticalGallery"> 113 112 <div id="item0" class="colorBox"><div id="console"></div></div> 114 113 <div id="item1" class="colorBox"></div> -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html
r210560 r258701 105 105 var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth; 106 106 var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight; 107 eventSender.monitorWheelEvents(); 107 108 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 108 109 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 152 153 var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth; 153 154 var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight; 155 eventSender.monitorWheelEvents(); 154 156 eventSender.mouseMoveTo(startPosX, startPosY); 155 157 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 167 169 { 168 170 if (window.eventSender) { 169 eventSender.monitorWheelEvents();170 171 internals.setPlatformMomentumScrollingPredictionEnabled(false); 171 172 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0); -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html
r210560 r258701 113 113 var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth; 114 114 var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight; 115 eventSender.monitorWheelEvents(); 115 116 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 116 117 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 162 163 var startPosX = windowPosition.x + divTarget.clientWidth - 10; 163 164 var startPosY = windowPosition.y + 50; 165 eventSender.monitorWheelEvents(); 164 166 eventSender.mouseMoveTo(startPosX, startPosY); 165 167 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 177 179 { 178 180 if (window.eventSender) { 179 eventSender.monitorWheelEvents();180 181 internals.setPlatformMomentumScrollingPredictionEnabled(false); 181 182 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0); -
trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html
r210560 r258701 107 107 var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth; 108 108 var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight; 109 eventSender.monitorWheelEvents(); 109 110 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 110 111 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 154 155 var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth; 155 156 var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight; 157 eventSender.monitorWheelEvents(); 156 158 eventSender.mouseMoveTo(startPosX, startPosY); 157 159 eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none'); … … 169 171 { 170 172 if (window.eventSender) { 171 eventSender.monitorWheelEvents();172 173 internals.setPlatformMomentumScrollingPredictionEnabled(false); 173 174 setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
Note: See TracChangeset
for help on using the changeset viewer.