Changeset 169692 in webkit
- Timestamp:
- Jun 9, 2014, 10:49:32 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/LayoutTests/ChangeLog ¶
r169691 r169692 1 2014-06-09 Simon Fraser <simon.fraser@apple.com> 2 3 Fix more latched scrolling test flakiness and slowness 4 https://bugs.webkit.org/show_bug.cgi?id=133601 5 6 Reviewed by Brent Fulgham. 7 8 Latched scrolling tests were flakey for two reasons. First, the EventSender 9 wheel events were async from the web to the UI process, and the resulting 10 synthetic events also async from the UI to the web process. Make them sync 11 for testing. 12 13 Secondly, the timer-based scrolling tree commit could result in the scrolling 14 tree (specifically the frame node's notion of the scrollable area and content 15 size) not being updated before the scrolling thread starts getting wheel events. 16 Fix by having WebPage::wheelEventSyncForTesting() commit if necessary. 17 18 Finally remove all the now-unnecessary timeouts from the tests. 19 20 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt: 21 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html: 22 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html: 23 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt: 24 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html: 25 * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html: 26 * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html: 27 * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html: 28 * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt: 29 * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html: 30 * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html: 31 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt: 32 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html: 33 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html: 34 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt: 35 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html: 36 * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html: 37 1 38 2014-06-09 Andrzej Badowski <a.badowski@samsung.com> 2 39 -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt ¶
r169650 r169692 58 58 Page after: 0, div after: 666 59 59 PASS Page did not receive wheel events. 60 Document was initial target for 4of the wheel events.60 Document was initial target for 8 of the wheel events. 61 61 (GraphicsLayer 62 62 (anchor 0.00 0.00) -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html ¶
r169650 r169692 47 47 var continueCount = 5; 48 48 49 function checkForScroll() {50 49 function checkForScroll() 50 { 51 51 // The div should not have scrolled at all. 52 52 var pageScrollPositionAfter = document.body.scrollTop; … … 71 71 } 72 72 73 function scrollTest() { 73 function scrollTest() 74 { 74 75 pageScrollPositionBefore = document.body.scrollTop; 75 76 … … 85 86 eventSender.mouseMoveTo(startPosX, startPosY); 86 87 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);96 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);97 setTimeout(checkForScroll, 100);88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 96 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 97 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 98 checkForScroll(); 98 99 } 99 100 100 function setupTopLevel() {101 101 function setupTopLevel() 102 { 102 103 if (window.eventSender) { 103 104 testRunner.dumpAsText(); 104 105 testRunner.waitUntilDone(); 105 106 setTimeout(scrollTest, 1000); 106 setTimeout(scrollTest, 0); 107 107 } else { 108 108 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html ¶
r169650 r169692 41 41 var continueCount = 5; 42 42 43 function checkForScroll() {44 43 function checkForScroll() 44 { 45 45 // The div should not have scrolled at all. 46 46 var pageScrollPositionAfter = document.body.scrollTop; … … 63 63 } 64 64 65 function scrollTest() { 65 function scrollTest() 66 { 66 67 pageScrollPositionBefore = document.body.scrollTop; 67 68 … … 77 78 eventSender.mouseMoveTo(startPosX, startPosY); 78 79 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 79 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);89 setTimeout(checkForScroll, 100);80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 90 checkForScroll(); 90 91 } 91 92 92 function setupTopLevel() {93 93 function setupTopLevel() 94 { 94 95 if (window.eventSender) { 95 96 testRunner.dumpAsText(); 96 97 testRunner.waitUntilDone(); 97 98 98 setTimeout(scrollTest, 1000);99 setTimeout(scrollTest, 0); 99 100 } else { 100 101 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt ¶
r168244 r169692 57 57 Page after: 70, div after: 0 58 58 PASS Scrollable div did not receive wheel events. 59 Document was initial target for 4of the wheel events.59 Document was initial target for 8 of the wheel events. 60 60 (GraphicsLayer 61 61 (anchor 0.00 0.00) -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html ¶
r169650 r169692 35 35 function onLoad() { 36 36 document.addEventListener("mousewheel", onScrollWheel); 37 window.addEventListener("scroll", onPageScroll); 37 38 setupTopLevel(); 38 39 } … … 47 48 var continueCount = 5; 48 49 49 function checkForScroll() { 50 function onPageScroll() 51 { 52 if (document.body.scrollTop >= 70) 53 checkForScroll(); 54 } 50 55 56 function checkForScroll() 57 { 51 58 // The div should not have scrolled at all. 52 59 var pageScrollPositionAfter = document.body.scrollTop; … … 71 78 } 72 79 73 function scrollTest() { 80 function scrollTest() 81 { 74 82 pageScrollPositionBefore = document.body.scrollTop; 75 83 … … 83 91 eventSender.mouseMoveTo(startPosX, startPosY); 84 92 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 95 setTimeout(checkForScroll, 100); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 96 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 97 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 98 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 99 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 100 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 101 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 102 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 103 104 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 105 setTimeout(checkForScroll, 500); 96 106 } 97 107 98 function setupTopLevel() {99 108 function setupTopLevel() 109 { 100 110 if (window.eventSender) { 101 111 testRunner.dumpAsText(); 102 112 testRunner.waitUntilDone(); 103 113 104 setTimeout(scrollTest, 1000);114 setTimeout(scrollTest, 0); 105 115 } else { 106 116 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html ¶
r169650 r169692 30 30 function onLoad() { 31 31 setupTopLevel(); 32 window.addEventListener("scroll", onPageScroll); 32 33 } 33 34 </script> … … 41 42 var continueCount = 5; 42 43 43 function checkForScroll() { 44 function onPageScroll() 45 { 46 if (document.body.scrollTop >= 70) 47 checkForScroll(); 48 } 44 49 50 function checkForScroll() 51 { 45 52 // The div should not have scrolled at all. 46 53 var pageScrollPositionAfter = document.body.scrollTop; … … 63 70 } 64 71 65 function scrollTest() { 72 function scrollTest() 73 { 66 74 pageScrollPositionBefore = document.body.scrollTop; 67 75 … … 75 83 eventSender.mouseMoveTo(startPosX, startPosY); 76 84 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 77 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 78 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 79 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 87 setTimeout(checkForScroll, 100); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 95 96 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 97 setTimeout(checkForScroll, 500); 88 98 } 89 99 90 function setupTopLevel() {91 100 function setupTopLevel() 101 { 92 102 if (window.eventSender) { 93 103 testRunner.dumpAsText(); 94 104 testRunner.waitUntilDone(); 95 105 96 setTimeout(scrollTest, 1000);106 setTimeout(scrollTest, 0); 97 107 } else { 98 108 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html ¶
r169311 r169692 23 23 var continueCount = 5; 24 24 25 function checkForScroll() {26 25 function checkForScroll() 26 { 27 27 // The IFrame should not have scrolled at all. 28 28 var pageScrollPositionAfter = document.body.scrollTop; … … 47 47 } 48 48 49 function scrollTest() {50 // See where our IFrame lives: 49 function scrollTest() 50 { 51 51 pageScrollPositionBefore = document.body.scrollTop; 52 52 … … 64 64 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame 65 65 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 66 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);67 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);68 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);69 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);70 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);71 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);72 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);73 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);74 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);75 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);76 setTimeout(checkForScroll, 100);66 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 67 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 68 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 69 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 70 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 71 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 72 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 73 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 74 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 75 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 76 checkForScroll(); 77 77 } 78 78 79 function setupTopLevel() {80 79 function setupTopLevel() 80 { 81 81 if (window.eventSender) { 82 82 testRunner.dumpAsText(); 83 83 testRunner.waitUntilDone(); 84 84 85 setTimeout(scrollTest, 1000);85 setTimeout(scrollTest, 0); 86 86 } else { 87 87 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html ¶
r169311 r169692 13 13 var continueCount = 5; 14 14 15 function checkForScroll() { 16 17 // The IFrame should not have scrolled at all. 15 function checkForScroll() 16 { 18 17 var pageScrollPositionAfter = document.body.scrollTop; 19 18 var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop; … … 35 34 } 36 35 37 function scrollTest() {38 // See where our IFrame lives: 36 function scrollTest() 37 { 39 38 pageScrollPositionBefore = document.body.scrollTop; 40 39 … … 46 45 iFrameScrollPositionBefore = iFrameBody.scrollTop; 47 46 48 // Scroll the #source until we reach the #target.49 47 var startPosX = iframeTarget.offsetLeft + 20; 50 48 debug("IFrame display height = " + iframeTarget.clientHeight); 51 var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.52 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame49 var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; 50 eventSender.mouseMoveTo(startPosX, startPosY); 53 51 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 54 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);55 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);56 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);57 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);58 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);59 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);60 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);61 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);62 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);63 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);64 setTimeout(checkForScroll, 100);52 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 53 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 54 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 55 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 56 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 57 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 58 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 59 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 60 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 61 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 62 checkForScroll(); 65 63 } 66 64 67 function setupTopLevel() {68 65 function setupTopLevel() 66 { 69 67 if (window.eventSender) { 70 68 testRunner.dumpAsText(); 71 69 testRunner.waitUntilDone(); 72 70 73 setTimeout(scrollTest, 1000);71 setTimeout(scrollTest, 0); 74 72 } else { 75 73 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt ¶
r168244 r169692 13 13 Page after: 70, IFrame after: 0 14 14 PASS IFrame did not receive wheel events. 15 Document was initial target for 4of the wheel events.15 Document was initial target for 8 of the wheel events. 16 16 (GraphicsLayer 17 17 (anchor 0.00 0.00) -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html ¶
r169311 r169692 12 12 function onLoad() { 13 13 document.addEventListener("mousewheel", onScrollWheel); 14 window.addEventListener("scroll", onPageScroll); 14 15 } 15 16 </script> … … 23 24 var continueCount = 5; 24 25 25 function checkForScroll() { 26 function onPageScroll() 27 { 28 if (document.body.scrollTop >= 70) 29 checkForScroll(); 30 } 26 31 32 function checkForScroll() 33 { 27 34 // The IFrame should not have scrolled at all. 28 35 var pageScrollPositionAfter = document.body.scrollTop; … … 47 54 } 48 55 49 function scrollTest() {50 // See where our IFrame lives: 56 function scrollTest() 57 { 51 58 pageScrollPositionBefore = document.body.scrollTop; 52 59 iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop; … … 54 61 iframeTarget = document.getElementById('target'); 55 62 56 // Scroll the #source until we reach the #target.57 63 var startPosX = iframeTarget.offsetLeft + 20; 58 var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame59 eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame64 var startPosY = iframeTarget.offsetTop - 42; 65 eventSender.mouseMoveTo(startPosX, startPosY); 60 66 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 61 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 62 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 63 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 64 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 65 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 66 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 67 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 68 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 69 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 70 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 71 setTimeout(checkForScroll, 100); 67 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 68 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 69 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 70 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 71 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 72 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 73 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 74 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 75 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 76 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 77 78 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 79 setTimeout(checkForScroll, 500); 72 80 } 73 81 74 function setupTopLevel() {75 82 function setupTopLevel() 83 { 76 84 if (window.eventSender) { 77 85 testRunner.dumpAsText(); 78 86 testRunner.waitUntilDone(); 79 87 80 setTimeout(scrollTest, 1000);88 setTimeout(scrollTest, 0); 81 89 } else { 82 90 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html ¶
r169650 r169692 5 5 <script src="../../../resources/js-test-pre.js"></script> 6 6 </head> 7 <body >7 <body onload="onLoad();"> 8 8 <script> 9 9 … … 13 13 var continueCount = 5; 14 14 15 function checkForScroll() { 15 function onLoad() 16 { 17 window.addEventListener("scroll", onPageScroll); 18 } 16 19 20 function onPageScroll() 21 { 22 if (document.body.scrollTop >= 70) 23 checkForScroll(); 24 } 25 26 function checkForScroll() 27 { 17 28 // The IFrame should not have scrolled at all. 18 29 var pageScrollPositionAfter = document.body.scrollTop; … … 35 46 } 36 47 37 function scrollTest() { 48 function scrollTest() 49 { 38 50 pageScrollPositionBefore = document.body.scrollTop; 39 51 iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop; 40 52 41 53 iframeTarget = document.getElementById('target'); 42 43 // Scroll the #source until we reach the #target. 54 44 55 var startPosX = iframeTarget.offsetLeft + 20; 45 56 var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame 46 57 eventSender.mouseMoveTo(startPosX, startPosY); 47 58 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 48 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 49 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 50 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 51 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 52 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 53 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 54 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 55 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 56 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 57 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 58 setTimeout(checkForScroll, 100); 59 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 60 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 61 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 62 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 63 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 64 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 65 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 66 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 67 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 68 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 69 70 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 71 setTimeout(checkForScroll, 500); 59 72 } 60 73 61 function setupTopLevel() {62 74 function setupTopLevel() 75 { 63 76 if (window.eventSender) { 64 77 testRunner.dumpAsText(); 65 78 testRunner.waitUntilDone(); 66 79 67 setTimeout(scrollTest, 1000);80 setTimeout(scrollTest, 0); 68 81 } else { 69 82 var messageLocation = document.getElementById('parent'); … … 78 91 79 92 </script> 80 <div id="parent" style="height: 2000px ">93 <div id="parent" style="height: 2000px;"> 81 94 <div id="source" style="height: 100px"> 82 95 Put mouse here and flick downwards -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt ¶
r168244 r169692 15 15 Page after: 70, select after: 0 16 16 PASS Select did not receive wheel events. 17 Document was initial target for 4of the wheel events.17 Document was initial target for 8 of the wheel events. 18 18 (GraphicsLayer 19 19 (anchor 0.00 0.00) -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html ¶
r169650 r169692 35 35 function onLoad() { 36 36 document.addEventListener("mousewheel", onScrollWheel); 37 window.addEventListener("scroll", onPageScroll); 37 38 setupTopLevel(); 38 39 } … … 47 48 var continueCount = 5; 48 49 49 function checkForScroll() { 50 function onPageScroll() 51 { 52 if (document.body.scrollTop >= 70) 53 checkForScroll(); 54 } 50 55 56 function checkForScroll() 57 { 51 58 // The select should not have scrolled at all. 52 59 var pageScrollPositionAfter = document.body.scrollTop; … … 71 78 } 72 79 73 function scrollTest() { 80 function scrollTest() 81 { 74 82 pageScrollPositionBefore = document.body.scrollTop; 75 83 … … 78 86 selectScrollPositionBefore = selectTarget.scrollTop; 79 87 80 // Scroll the #source until we reach the #target.81 88 var startPosX = Math.round(selectTarget.offsetLeft) + 20; 82 89 var startPosY = Math.round(selectTarget.offsetTop) - 42; 83 90 eventSender.mouseMoveTo(startPosX, startPosY); 84 91 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 95 setTimeout(checkForScroll, 100); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 96 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 97 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 98 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 99 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 100 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 101 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 102 103 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 104 setTimeout(checkForScroll, 500); 96 105 } 97 106 98 function setupTopLevel() {99 107 function setupTopLevel() 108 { 100 109 if (window.eventSender) { 101 110 testRunner.dumpAsText(); 102 111 testRunner.waitUntilDone(); 103 112 104 setTimeout(scrollTest, 1000);113 setTimeout(scrollTest, 0); 105 114 } else { 106 115 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html ¶
r169650 r169692 29 29 <script> 30 30 function onLoad() { 31 window.addEventListener("scroll", onPageScroll); 31 32 setupTopLevel(); 32 33 } … … 41 42 var continueCount = 5; 42 43 43 function checkForScroll() { 44 function onPageScroll() 45 { 46 if (document.body.scrollTop >= 70) 47 checkForScroll(); 48 } 44 49 50 function checkForScroll() 51 { 45 52 // The select should not have scrolled at all. 46 53 var pageScrollPositionAfter = document.body.scrollTop; … … 63 70 } 64 71 65 function scrollTest() { 72 function scrollTest() 73 { 66 74 pageScrollPositionBefore = document.body.scrollTop; 67 75 … … 75 83 eventSender.mouseMoveTo(startPosX, startPosY); 76 84 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 77 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true); 78 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 79 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true); 80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true); 81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true); 82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true); 87 setTimeout(checkForScroll, 100); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 95 96 // We should finish via the scroll event; this will fire in the case of failure when the page doesn't scroll. 97 setTimeout(checkForScroll, 500); 88 98 } 89 99 90 function setupTopLevel() {91 100 function setupTopLevel() 101 { 92 102 if (window.eventSender) { 93 103 testRunner.dumpAsText(); 94 104 testRunner.waitUntilDone(); 95 105 96 setTimeout(scrollTest, 1000);106 setTimeout(scrollTest, 0); 97 107 } else { 98 108 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt ¶
r169650 r169692 16 16 Page after: 0, select after: 140 17 17 PASS Page did not receive wheel events. 18 Document was initial target for 4of the wheel events.18 Document was initial target for 8 of the wheel events. 19 19 (GraphicsLayer 20 20 (anchor 0.00 0.00) -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html ¶
r169650 r169692 47 47 var continueCount = 5; 48 48 49 function checkForScroll() {50 49 function checkForScroll() 50 { 51 51 // The page should not have scrolled at all. 52 52 var pageScrollPositionAfter = document.body.scrollTop; … … 71 71 } 72 72 73 function scrollTest() { 73 function scrollTest() 74 { 74 75 pageScrollPositionBefore = document.body.scrollTop; 75 76 … … 84 85 eventSender.mouseMoveTo(startPosX, startPosY); 85 86 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);96 setTimeout(checkForScroll, 100);87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 90 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 91 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 92 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 93 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 94 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 95 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 96 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 97 checkForScroll(); 97 98 } 98 99 99 function setupTopLevel() {100 100 function setupTopLevel() 101 { 101 102 if (window.eventSender) { 102 103 testRunner.dumpAsText(); 103 104 testRunner.waitUntilDone(); 104 105 105 setTimeout(scrollTest, 1000);106 setTimeout(scrollTest, 0); 106 107 } else { 107 108 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html ¶
r169650 r169692 41 41 var continueCount = 5; 42 42 43 function checkForScroll() {44 43 function checkForScroll() 44 { 45 45 // The page should not have scrolled at all. 46 46 var pageScrollPositionAfter = document.body.scrollTop; … … 63 63 } 64 64 65 function scrollTest() { 65 function scrollTest() 66 { 66 67 pageScrollPositionBefore = document.body.scrollTop; 67 68 … … 77 78 eventSender.mouseMoveTo(startPosX, startPosY); 78 79 debug("Mouse moved to (" + startPosX + ", " + startPosY + ")"); 79 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none' , true);80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none' , true);82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none' , true);83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin' , true);84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue' , true);88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end' , true);89 setTimeout(checkForScroll, 100);80 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none'); 81 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 82 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none'); 83 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none'); 84 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin'); 85 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 86 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 87 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 88 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue'); 89 eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end'); 90 checkForScroll(); 90 91 } 91 92 92 function setupTopLevel() {93 93 function setupTopLevel() 94 { 94 95 if (window.eventSender) { 95 96 testRunner.dumpAsText(); 96 97 testRunner.waitUntilDone(); 97 98 98 setTimeout(scrollTest, 1000);99 setTimeout(scrollTest, 0); 99 100 } else { 100 101 var messageLocation = document.getElementById('parent'); -
TabularUnified trunk/Source/WebKit2/ChangeLog ¶
r169688 r169692 1 2014-06-09 Simon Fraser <simon.fraser@apple.com> 2 3 Fix more latched scrolling test flakiness and slowness 4 https://bugs.webkit.org/show_bug.cgi?id=133601 5 6 Reviewed by Brent Fulgham. 7 8 Latched scrolling tests were flakey for two reasons. First, the EventSender 9 wheel events were async from the web to the UI process, and the resulting 10 synthetic events also async from the UI to the web process. Make them sync 11 for testing. 12 13 Secondly, the timer-based scrolling tree commit could result in the scrolling 14 tree (specifically the frame node's notion of the scrollable area and content 15 size) not being updated before the scrolling thread starts getting wheel events. 16 Fix by having WebPage::wheelEventSyncForTesting() commit if necessary. 17 18 Finally remove all the now-unnecessary timeouts from the tests. 19 20 * WebProcess/WebPage/WebPage.cpp: 21 (WebKit::WebPage::wheelEventSyncForTesting): 22 1 23 2014-06-09 Andrzej Badowski <a.badowski@samsung.com> 2 24 -
TabularUnified trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp ¶
r169625 r169692 1880 1880 CurrentEvent currentEvent(wheelEvent); 1881 1881 1882 if (ScrollingCoordinator* scrollingCoordinator = m_page->scrollingCoordinator()) 1883 scrollingCoordinator->commitTreeStateIfNeeded(); 1884 1882 1885 handled = handleWheelEvent(wheelEvent, m_page.get()); 1883 1886 } -
TabularUnified trunk/Tools/ChangeLog ¶
r169688 r169692 1 2014-06-09 Simon Fraser <simon.fraser@apple.com> 2 3 Fix more latched scrolling test flakiness and slowness 4 https://bugs.webkit.org/show_bug.cgi?id=133601 5 6 Reviewed by Brent Fulgham. 7 8 Latched scrolling tests were flakey for two reasons. First, the EventSender 9 wheel events were async from the web to the UI process, and the resulting 10 synthetic events also async from the UI to the web process. Make them sync 11 for testing. 12 13 Secondly, the timer-based scrolling tree commit could result in the scrolling 14 tree (specifically the frame node's notion of the scrollable area and content 15 size) not being updated before the scrolling thread starts getting wheel events. 16 Fix by having WebPage::wheelEventSyncForTesting() commit if necessary. 17 18 Finally remove all the now-unnecessary timeouts from the tests. 19 20 * WebKitTestRunner/mac/EventSenderProxy.mm: 21 (WTR::EventSenderProxy::mouseMoveTo): 22 (WTR::EventSenderProxy::mouseScrollBy): 23 (WTR::EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases): 24 1 25 2014-06-09 Andrzej Badowski <a.badowski@samsung.com> 2 26 -
TabularUnified trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm ¶
r169662 r169692 33 33 #import <Carbon/Carbon.h> 34 34 #import <WebKit/WKString.h> 35 #import <WebKit/WKPagePrivate.h> 35 36 #import <wtf/RetainPtr.h> 36 37 … … 219 220 if (targetView) { 220 221 [NSApp _setCurrentEvent:event]; 222 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), true); 221 223 [targetView mouseMoved:event]; 224 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), false); 222 225 [NSApp _setCurrentEvent:nil]; 223 226 } else { … … 456 459 if (NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[event locationInWindow]]) { 457 460 [NSApp _setCurrentEvent:event]; 461 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), true); 458 462 [targetView scrollWheel:event]; 463 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), false); 459 464 [NSApp _setCurrentEvent:nil]; 460 465 } else { 461 466 NSPoint location = [event locationInWindow]; 462 WTFLogAlways("mouseScrollBy WithWheelAndMomentumPhasesfailed to find the target view at %f,%f\n", location.x, location.y);467 WTFLogAlways("mouseScrollBy failed to find the target view at %f,%f\n", location.x, location.y); 463 468 } 464 469 } … … 493 498 if (NSView *targetView = [m_testController->mainWebView()->platformView() hitTest:[event locationInWindow]]) { 494 499 [NSApp _setCurrentEvent:event]; 500 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), true); 495 501 [targetView scrollWheel:event]; 502 WKPageSetShouldSendEventsSynchronously(m_testController->mainWebView()->page(), false); 496 503 [NSApp _setCurrentEvent:nil]; 497 504 } else {
Note:
See TracChangeset
for help on using the changeset viewer.