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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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', '0']; | 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"); |
97 eventSender.gestureScrollBegin(10, 72); | 97 eventSender.gestureScrollBegin(10, 72); |
98 eventSender.gestureScrollUpdateWithoutPropagation(0, -150); | 98 eventSender.gestureScrollUpdate(0, -150, true); |
99 eventSender.gestureScrollEnd(0, 0); | 99 eventSender.gestureScrollEnd(0, 0); |
100 | 100 |
101 // Wait for layout. | 101 // Wait for layout. |
102 checkScrollOffset(); | 102 checkScrollOffset(); |
103 } | 103 } |
104 | 104 |
105 function secondGestureScroll() | 105 function secondGestureScroll() |
106 { | 106 { |
107 debug("second gesture"); | 107 debug("second gesture"); |
108 eventSender.gestureScrollBegin(12, 40); | 108 eventSender.gestureScrollBegin(12, 40); |
109 eventSender.gestureScrollUpdateWithoutPropagation(0, -50); | 109 eventSender.gestureScrollUpdate(0, -50, true); |
110 eventSender.gestureScrollUpdateWithoutPropagation(0, -10); | 110 eventSender.gestureScrollUpdate(0, -10, true); |
111 eventSender.gestureScrollEnd(0, 0); | 111 eventSender.gestureScrollEnd(0, 0); |
112 | 112 |
113 // Wait for layout. | 113 // Wait for layout. |
114 checkScrollOffset(); | 114 checkScrollOffset(); |
115 } | 115 } |
116 | 116 |
117 if (window.testRunner) | 117 if (window.testRunner) |
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 not propagated from an
' + | 128 description('This tests that a gesture scroll is not 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 when the GestureScrollUpdateWithoutProp
agation ' + | 130 'remaining scroll offset when the preventPropagation flag is set
for ' + |
131 'event type is used.'); | 131 'the GestureScrollUpdate event type.'); |
132 if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWit
houtPropagation) | 132 if (checkTestDependencies() && window.eventSender.gestureScrollUpdate) |
133 firstGestureScroll(); | 133 firstGestureScroll(); |
134 else | 134 else |
135 exitIfNecessary(); | 135 exitIfNecessary(); |
136 } else { | 136 } else { |
137 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); | 137 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); |
138 } | 138 } |
139 } | 139 } |
140 </script> | 140 </script> |
141 | 141 |
142 | 142 |
143 | 143 |
144 </body> | 144 </body> |
145 </html> | 145 </html> |
OLD | NEW |