| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <html> | 2 <html> |
| 3 <head> | 3 <head> |
| 4 <script src="../../../../resources/js-test.js"></script> | 4 <script src="../../../../resources/js-test.js"></script> |
| 5 <script src="resources/gesture-helpers.js"></script> | 5 <script src="resources/gesture-helpers.js"></script> |
| 6 <style type="text/css"> | 6 <style type="text/css"> |
| 7 | 7 |
| 8 ::-webkit-scrollbar { | 8 ::-webkit-scrollbar { |
| 9 width: 0px; | 9 width: 0px; |
| 10 height: 0px; | 10 height: 0px; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 <p id="description"></p> | 77 <p id="description"></p> |
| 78 <div id="console"></div> | 78 <div id="console"></div> |
| 79 <script type="text/javascript"> | 79 <script type="text/javascript"> |
| 80 | 80 |
| 81 var movedbox; | 81 var movedbox; |
| 82 var touchtarget; | 82 var touchtarget; |
| 83 var expectedGesturesTotal = 2; | 83 var expectedGesturesTotal = 2; |
| 84 var gesturesOccurred = 0; | 84 var gesturesOccurred = 0; |
| 85 var scrollAmountX = ['0', '0']; | 85 var scrollAmountX = ['0', '0']; |
| 86 var scrollAmountY = ['0', '10']; | 86 var scrollAmountY = ['0', '0']; |
| 87 var wheelEventsOccurred = 0; | 87 var wheelEventsOccurred = 0; |
| 88 var expectedWheelEventsOccurred = ['0', '0']; | 88 var expectedWheelEventsOccurred = ['0', '0']; |
| 89 var scrollEventsOccurred = 0; | 89 var scrollEventsOccurred = 0; |
| 90 var scrolledElement = 'movedbox' | 90 var scrolledElement = 'movedbox' |
| 91 var scrollEventsOccurred = 0; | 91 var scrollEventsOccurred = 0; |
| 92 var expectedScrollEventsOccurred = '1'; | 92 var expectedScrollEventsOccurred = '1'; |
| 93 | 93 |
| 94 function firstGestureScroll() | 94 function firstGestureScroll() |
| 95 { | 95 { |
| 96 debug("first gesture"); | 96 debug("first gesture"); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 118 testRunner.waitUntilDone(); | 118 testRunner.waitUntilDone(); |
| 119 | 119 |
| 120 function runTest() | 120 function runTest() |
| 121 { | 121 { |
| 122 movedbox = document.getElementById("outerdiv"); | 122 movedbox = document.getElementById("outerdiv"); |
| 123 touchtarget = document.getElementById("innerdiv"); | 123 touchtarget = document.getElementById("innerdiv"); |
| 124 touchtarget.addEventListener("scroll", recordScroll); | 124 touchtarget.addEventListener("scroll", recordScroll); |
| 125 touchtarget.addEventListener("mousewheel", recordWheel); | 125 touchtarget.addEventListener("mousewheel", recordWheel); |
| 126 | 126 |
| 127 if (window.eventSender) { | 127 if (window.eventSender) { |
| 128 description('This tests that a gesture scroll is propagated from an ' + | 128 description('This tests that a gesture scroll isn\'t propagated from an
' + |
| 129 'inner div to an outer div when the inner div has no ' + | 129 'inner div to an outer div when the inner div has no ' + |
| 130 'remaining scroll offset.'); | 130 'remaining scroll offset.'); |
| 131 if (checkTestDependencies()) | 131 if (checkTestDependencies()) |
| 132 firstGestureScroll(); | 132 firstGestureScroll(); |
| 133 else | 133 else |
| 134 exitIfNecessary(); | 134 exitIfNecessary(); |
| 135 } else { | 135 } else { |
| 136 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); | 136 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); |
| 137 } | 137 } |
| 138 } | 138 } |
| 139 </script> | 139 </script> |
| 140 | 140 |
| 141 | 141 |
| 142 | 142 |
| 143 </body> | 143 </body> |
| 144 </html> | 144 </html> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1320543006:
Remove touch scroll chaining from main thread scrolling. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@gclient