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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 var iframe; | 53 var iframe; |
54 var iframeBody; | 54 var iframeBody; |
55 var iframeDocumentElement; | 55 var iframeDocumentElement; |
56 var expectedGesturesTotal = 1; | 56 var expectedGesturesTotal = 1; |
57 var gesturesOccurred = 0; | 57 var gesturesOccurred = 0; |
58 var scrollAmountX = ['0']; | 58 var scrollAmountX = ['0']; |
59 var scrollAmountY = ['0']; | 59 var scrollAmountY = ['0']; |
60 var wheelEventsOccurred = 0; | 60 var wheelEventsOccurred = 0; |
61 var expectedWheelEventsOccurred = ['0']; | 61 var expectedWheelEventsOccurred = ['0']; |
62 var scrollEventsOccurred = 0; | 62 var scrollEventsOccurred = 0; |
63 var scrolledElement = 'movedbox' | 63 var scrolledElement = 'movedbox'; |
64 var scrollEventsOccurred = 0; | 64 var scrollEventsOccurred = 0; |
65 var expectedScrollEventsOccurred = '1'; | 65 var expectedScrollEventsOccurred = '1'; |
66 | 66 |
67 function firstGestureScroll() | 67 function firstGestureScroll() |
68 { | 68 { |
69 iframe = touchtarget; | 69 iframe = touchtarget; |
70 iframeBody = iframe.contentDocument.body; | 70 iframeBody = iframe.contentDocument.body; |
71 iframeDocumentElement = iframe.contentDocument.documentElement; | 71 iframeDocumentElement = iframe.contentDocument.documentElement; |
72 | 72 |
73 debug("first gesture"); | 73 debug("first gesture"); |
74 eventSender.gestureScrollBegin(10, 72); | 74 eventSender.gestureScrollBegin(10, 72); |
75 eventSender.gestureScrollUpdateWithoutPropagation(0, -700); | 75 // Prevent scroll to propagate by passing true for third parameter |
76 eventSender.gestureScrollUpdateWithoutPropagation(0, -100); | 76 eventSender.gestureScrollUpdate(0, -700, true); |
77 eventSender.gestureScrollUpdateWithoutPropagation(0, -70); | 77 eventSender.gestureScrollUpdate(0, -100, true); |
78 eventSender.gestureScrollUpdateWithoutPropagation(0, -10); | 78 eventSender.gestureScrollUpdate(0, -70, true); |
| 79 eventSender.gestureScrollUpdate(0, -10, true); |
79 eventSender.gestureScrollEnd(0, 0); | 80 eventSender.gestureScrollEnd(0, 0); |
80 | 81 |
81 // Make sure the actual iframe got fully scrolled | 82 // Make sure the actual iframe got fully scrolled |
82 shouldBe('iframeBody.scrollHeight - iframeDocumentElement.scrollTop', 'ifram
e.clientHeight'); | 83 shouldBe('iframeBody.scrollHeight - iframeDocumentElement.scrollTop', 'ifram
e.clientHeight'); |
83 | 84 |
84 // Wait for layout. | 85 // Wait for layout. |
85 checkScrollOffset(); | 86 checkScrollOffset(); |
86 } | 87 } |
87 | 88 |
88 if (window.testRunner) | 89 if (window.testRunner) |
89 testRunner.waitUntilDone(); | 90 testRunner.waitUntilDone(); |
90 | 91 |
91 function runTest() | 92 function runTest() |
92 { | 93 { |
93 movedbox = document.getElementById("outerdiv"); | 94 movedbox = document.getElementById("outerdiv"); |
94 touchtarget = document.getElementById("touchtargetiframe"); | 95 touchtarget = document.getElementById("touchtargetiframe"); |
95 touchtarget.contentDocument.addEventListener("scroll", recordScroll); | 96 touchtarget.contentDocument.addEventListener("scroll", recordScroll); |
96 touchtarget.contentDocument.body.addEventListener("mousewheel", recordWheel)
; | 97 touchtarget.contentDocument.body.addEventListener("mousewheel", recordWheel)
; |
97 | 98 |
98 if (window.eventSender) { | 99 if (window.eventSender) { |
99 description('This tests that a gesture scroll is not propagated from an
' + | 100 description('This tests that a gesture scroll is not propagated from an
' + |
100 'iframe to an outer div when the iframe has no remaining ' + | 101 'iframe to an outer div when the iframe has no remaining ' + |
101 'scroll offset when the gesture type GestureScrollUpdateWithoutP
ropagation is used.'); | 102 'scroll offset when the preventPropagation flag is set for the g
esture '+ |
102 if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWit
houtPropagation) | 103 'type GestureScrollUpdate.'); |
| 104 if (checkTestDependencies() && window.eventSender.gestureScrollUpdate) |
103 firstGestureScroll(); | 105 firstGestureScroll(); |
104 else | 106 else |
105 exitIfNecessary(); | 107 exitIfNecessary(); |
106 } else { | 108 } else { |
107 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); | 109 debug("This test requires DumpRenderTree. Gesture-scroll the page to va
lidate the implementation."); |
108 } | 110 } |
109 } | 111 } |
110 </script> | 112 </script> |
111 | 113 |
112 | 114 |
113 | 115 |
114 </body> | 116 </body> |
115 </html> | 117 </html> |
OLD | NEW |