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 <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 #touchtarget { | 7 #touchtarget { |
8 width: 100px; | 8 width: 100px; |
9 height: 100px; | 9 height: 100px; |
10 position: relative; | 10 position: relative; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
63 </div> | 63 </div> |
64 </div> | 64 </div> |
65 | 65 |
66 <p id="description"></p> | 66 <p id="description"></p> |
67 <div id="console"></div> | 67 <div id="console"></div> |
68 <script type="text/javascript"> | 68 <script type="text/javascript"> |
69 | 69 |
70 var movingdiv; | 70 var movingdiv; |
71 var expectedGesturesTotal = 2; | 71 var expectedGesturesTotal = 2; |
72 var gesturesOccurred = 0; | 72 var gesturesOccurred = 0; |
73 var scrollAmountX = ['90', '90']; | 73 var scrollAmountX = ['80', '80']; |
74 var scrollAmountY = ['0', '95']; | 74 var scrollAmountY = ['0', '32']; |
75 var wheelEventsOccurred = 0; | 75 var wheelEventsOccurred = 0; |
76 var expectedWheelEventsOccurred = ['0', '0']; | 76 var expectedWheelEventsOccurred = ['0', '0']; |
77 var scrollEventsOccurred = 0; | 77 var scrollEventsOccurred = 0; |
78 var expectedScrollEventsOccurred = '1'; | 78 var expectedScrollEventsOccurred = '1'; |
79 var scrolledElement = 'movingdiv' | 79 var scrolledElement = 'movingdiv' |
80 | 80 |
81 function firstGestureScroll() | 81 function firstGestureScroll() |
82 { | 82 { |
83 debug("first gesture"); | 83 debug("first gesture"); |
84 eventSender.gestureScrollBegin(95, 12); | 84 |
85 eventSender.gestureScrollUpdate(-90, 0); | 85 window.internals.setZoomFactor(0.5); |
| 86 eventSender.gestureScrollBegin(45, 12); |
| 87 eventSender.gestureScrollUpdate(-40, 0); |
86 eventSender.gestureScrollEnd(0, 0); | 88 eventSender.gestureScrollEnd(0, 0); |
87 | 89 |
88 // Wait for layout. | 90 // Wait for layout. |
89 checkScrollOffset(); | 91 checkScrollOffset(); |
90 } | 92 } |
91 | 93 |
92 function secondGestureScroll() | 94 function secondGestureScroll() |
93 { | 95 { |
94 debug("second gesture"); | 96 debug("second gesture"); |
95 eventSender.gestureScrollBegin(12, 97); | 97 |
96 eventSender.gestureScrollUpdate(0, -95); | 98 window.internals.setZoomFactor(1.25); |
| 99 eventSender.gestureScrollBegin(12, 47); |
| 100 eventSender.gestureScrollUpdate(0, -40); |
97 eventSender.gestureScrollEnd(0, 0); | 101 eventSender.gestureScrollEnd(0, 0); |
98 | 102 |
99 // Wait for layout. | 103 // Wait for layout. |
100 checkScrollOffset(); | 104 checkScrollOffset(); |
101 } | 105 } |
102 | 106 |
103 if (window.testRunner) | 107 if (window.testRunner) |
104 testRunner.waitUntilDone(); | 108 testRunner.waitUntilDone(); |
105 | 109 |
106 function runTest() | 110 function runTest() |
107 { | 111 { |
108 movingdiv = document.getElementById('movingbox'); | 112 movingdiv = document.getElementById('movingbox'); |
109 movingdiv.addEventListener("scroll", recordScroll); | 113 movingdiv.addEventListener("scroll", recordScroll); |
110 window.addEventListener("mousewheel", recordWheel); | 114 window.addEventListener("mousewheel", recordWheel); |
111 | 115 |
112 if (window.eventSender) { | 116 if (window.eventSender) { |
113 description('This tests gesture event scrolling of an overflow div.'); | 117 description('This tests gesture event scrolling of an overflow div with
browser zoom.'); |
114 | 118 |
115 if (checkTestDependencies()) | 119 if (checkTestDependencies()) |
116 firstGestureScroll(); | 120 firstGestureScroll(); |
117 else | 121 else |
118 exitIfNecessary(); | 122 exitIfNecessary(); |
119 } else { | 123 } else { |
120 debug("This test requires DumpRenderTree. Touch scroll the red rect to
log."); | 124 debug("This test requires DumpRenderTree. Touch scroll the red rect to
log."); |
121 } | 125 } |
122 } | 126 } |
123 </script> | 127 </script> |
124 </body> | 128 </body> |
125 </html> | 129 </html> |
OLD | NEW |