OLD | NEW |
---|---|
1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
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 <style type="text/css"> | 5 <style type="text/css"> |
6 #gesturetarget { | 6 #gesturetarget { |
7 width: 100px; | 7 width: 100px; |
8 height: 100px; | 8 height: 100px; |
9 position: relative; | 9 position: relative; |
10 background: white; | 10 background: white; |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
62 </div> | 62 </div> |
63 </div> | 63 </div> |
64 | 64 |
65 <p id="description"></p> | 65 <p id="description"></p> |
66 <div id="console"></div> | 66 <div id="console"></div> |
67 <script type="text/javascript"> | 67 <script type="text/javascript"> |
68 | 68 |
69 var movingdiv; | 69 var movingdiv; |
70 var expectedScrollsTotal = 2; | 70 var expectedScrollsTotal = 2; |
71 var scrollsOccurred = 0; | 71 var scrollsOccurred = 0; |
72 var scrollAmountX = ['90', '90']; | 72 var scrollAmountX = ['80', '80']; |
73 var scrollAmountY = ['0', '95']; | 73 var scrollAmountY = ['0', '32']; |
74 | 74 |
75 function checkScrollOffset() | 75 function checkScrollOffset() |
76 { | 76 { |
77 movingdiv = document.getElementById('movingbox'); | 77 movingdiv = document.getElementById('movingbox'); |
78 if (window.eventSender) { | 78 if (window.eventSender) { |
79 shouldBe('movingdiv.scrollTop', scrollAmountY[scrollsOccurred]); | 79 shouldBe('movingdiv.scrollTop', scrollAmountY[scrollsOccurred]); |
Rick Byers
2014/09/22 21:21:16
This test is supposed to be checking page scrollin
| |
80 shouldBe('movingdiv.scrollLeft', scrollAmountX[scrollsOccurred]); | 80 shouldBe('movingdiv.scrollLeft', scrollAmountX[scrollsOccurred]); |
81 scrollsOccurred++; | 81 scrollsOccurred++; |
82 } | 82 } |
83 | 83 |
84 if (scrollsOccurred == expectedScrollsTotal) { | 84 if (scrollsOccurred == expectedScrollsTotal) { |
85 // If we've got here, we've passed. | 85 // If we've got here, we've passed. |
86 isSuccessfullyParsed(); | 86 isSuccessfullyParsed(); |
87 if (window.testRunner) | 87 if (window.testRunner) |
88 testRunner.notifyDone(); | 88 testRunner.notifyDone(); |
89 } else { | 89 } else { |
90 secondGestureScrollSequence(); | 90 secondGestureScrollSequence(); |
91 } | 91 } |
92 } | 92 } |
93 | 93 |
94 function firstGestureScrollSequence() | 94 function firstGestureScrollSequence() |
95 { | 95 { |
96 debug("first gesture"); | 96 debug("first gesture"); |
97 | 97 |
98 eventSender.gestureScrollBegin(95, 12); | 98 window.internals.setZoomFactor(0.5); |
99 eventSender.gestureScrollUpdate(-90, 0); | 99 eventSender.gestureScrollBegin(45, 12); |
100 eventSender.gestureScrollUpdate(-40, 0); | |
100 eventSender.gestureScrollEnd(0, 0); | 101 eventSender.gestureScrollEnd(0, 0); |
101 | 102 |
102 // Wait for layout. | 103 // Wait for layout. |
103 checkScrollOffset(); | 104 checkScrollOffset(); |
104 } | 105 } |
105 | 106 |
106 function secondGestureScrollSequence() | 107 function secondGestureScrollSequence() |
107 { | 108 { |
108 debug("second gesture"); | 109 debug("second gesture"); |
109 | 110 |
110 eventSender.gestureScrollBegin(12, 97); | 111 window.internals.setZoomFactor(1.25); |
111 eventSender.gestureScrollUpdate(0, -95); | 112 eventSender.gestureScrollBegin(12, 47); |
113 eventSender.gestureScrollUpdate(0, -40); | |
112 eventSender.gestureScrollEnd(0, 0); | 114 eventSender.gestureScrollEnd(0, 0); |
113 | 115 |
114 // Wait for layout. | 116 // Wait for layout. |
115 checkScrollOffset(); | 117 checkScrollOffset(); |
116 } | 118 } |
117 | 119 |
118 function exitIfNecessary() | 120 function exitIfNecessary() |
119 { | 121 { |
120 debug('Gesture events not implemented on this platform or broken'); | 122 debug('Gesture events not implemented on this platform or broken'); |
121 isSuccessfullyParsed(); | 123 isSuccessfullyParsed(); |
122 if (window.testRunner) | 124 if (window.testRunner) |
123 testRunner.notifyDone(); | 125 testRunner.notifyDone(); |
124 } | 126 } |
125 | 127 |
126 if (window.testRunner) | 128 if (window.testRunner) |
127 testRunner.waitUntilDone(); | 129 testRunner.waitUntilDone(); |
128 | 130 |
129 function runTest() | 131 function runTest() |
130 { | 132 { |
131 var movingdiv = document.getElementById('movingbox'); | 133 var movingdiv = document.getElementById('movingbox'); |
132 | 134 |
133 if (window.eventSender) { | 135 if (window.eventSender) { |
134 description('This tests scroll gesture events. ' + | 136 description('This tests scroll gesture events with browser zoom. ' + |
135 'Square is (mostly) green on pass'); | 137 'Square is (mostly) green on pass'); |
136 | 138 |
137 if (eventSender.clearTouchPoints) | 139 if (eventSender.clearTouchPoints) |
138 firstGestureScrollSequence(); | 140 firstGestureScrollSequence(); |
139 else | 141 else |
140 exitIfNecessary(); | 142 exitIfNecessary(); |
141 } else { | 143 } else { |
142 debug("This test requires DumpRenderTree."); | 144 debug("This test requires DumpRenderTree."); |
143 } | 145 } |
144 } | 146 } |
145 </script> | 147 </script> |
146 </body> | 148 </body> |
147 </html> | 149 </html> |
OLD | NEW |