Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1709)

Side by Side Diff: LayoutTests/fast/events/pointerevents/touch-pointercancel.html

Issue 1316013007: Added a test for pointercancel from touchcancel. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | LayoutTests/fast/events/pointerevents/touch-pointercancel-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <script src="../../../resources/js-test.js"></script> 2 <script src="../../../resources/js-test.js"></script>
3 <style> 3 <style>
4 div.test { 4 div.test {
5 margin: 10px; 5 margin: 10px;
6 width: 100px; 6 width: 100px;
7 height: 200px; 7 height: 200px;
8 overflow: scroll; 8 overflow: scroll;
9 border: solid 1px; 9 border: solid 1px;
10 float: left; 10 float: left;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 eventSender.touchEnd(); 73 eventSender.touchEnd();
74 } 74 }
75 75
76 function testMultiDrag(uncanceledMoveCausesScroll) { 76 function testMultiDrag(uncanceledMoveCausesScroll) {
77 var rect; 77 var rect;
78 78
79 rect = document.getElementById("target").getBoundingClientRect(); 79 rect = document.getElementById("target").getBoundingClientRect();
80 var x0 = rect.left + 30; 80 var x0 = rect.left + 30;
81 var x1 = rect.left + 50; 81 var x1 = rect.left + 50;
82 var x2 = rect.left + 70; 82 var x2 = rect.left + 70;
83 var x3 = rect.left + 55;
83 var y = rect.top + 50; 84 var y = rect.top + 50;
84 85
85 eventSender.addTouchPoint(x0, y); 86 eventSender.addTouchPoint(x0, y);
86 eventSender.addTouchPoint(x1, y); 87 eventSender.addTouchPoint(x1, y);
87 eventSender.addTouchPoint(x2, y); 88 eventSender.addTouchPoint(x2, y);
88 eventSender.touchStart(); 89 eventSender.touchStart();
89 90
90 y += 50; 91 y += 50;
91 eventSender.updateTouchPoint(0, x0, y); 92 eventSender.updateTouchPoint(0, x0, y);
92 eventSender.updateTouchPoint(1, x1, y); 93 eventSender.updateTouchPoint(1, x1, y);
93 eventSender.updateTouchPoint(2, x2, y); 94 eventSender.updateTouchPoint(2, x2, y);
94 eventSender.touchMove(); 95 eventSender.touchMove();
95 96
96 y += 50; 97 y += 50;
97 eventSender.updateTouchPoint(0, x0, y); 98 eventSender.updateTouchPoint(0, x0, y);
98 eventSender.updateTouchPoint(1, x1, y); 99 eventSender.updateTouchPoint(1, x1, y);
99 eventSender.updateTouchPoint(2, x2, y); 100 eventSender.updateTouchPoint(2, x2, y);
100 if (uncanceledMoveCausesScroll) 101 if (uncanceledMoveCausesScroll)
101 eventSender.touchMoveCausingScrollIfUncanceled(); 102 eventSender.touchMoveCausingScrollIfUncanceled();
102 else 103 else
103 eventSender.touchMove(); 104 eventSender.touchMove();
104 105
105 eventSender.addTouchPoint(x1+10, y); 106 eventSender.addTouchPoint(x3, y);
106 eventSender.touchStart(); 107 eventSender.touchStart();
107 108
108 y += 50; 109 y += 50;
109 eventSender.updateTouchPoint(0, x0, y); 110 eventSender.updateTouchPoint(0, x0, y);
110 eventSender.updateTouchPoint(1, x1, y); 111 eventSender.updateTouchPoint(1, x1, y);
111 eventSender.updateTouchPoint(2, x2, y); 112 eventSender.updateTouchPoint(2, x2, y);
112 eventSender.updateTouchPoint(3, x2+10, y); 113 eventSender.updateTouchPoint(3, x3, y);
113 eventSender.touchMove(); 114 eventSender.touchMove();
114 115
115 eventSender.releaseTouchPoint(0); 116 eventSender.releaseTouchPoint(0);
116 eventSender.releaseTouchPoint(1); 117 eventSender.releaseTouchPoint(1);
117 eventSender.releaseTouchPoint(2); 118 eventSender.releaseTouchPoint(2);
118 eventSender.releaseTouchPoint(3); 119 eventSender.releaseTouchPoint(3);
119 eventSender.touchEnd(); 120 eventSender.touchEnd();
120 } 121 }
121 122
123 function testMultiCancel() {
124 var rect;
125
126 rect = document.getElementById("target").getBoundingClientRect();
127 var x0 = rect.left + 30;
128 var x1 = rect.left + 50;
129 var x2 = rect.left + 70;
130 var y = rect.top + 50;
131
132 eventSender.addTouchPoint(x0, y);
133 eventSender.addTouchPoint(x1, y);
134 eventSender.addTouchPoint(x2, y);
135 eventSender.touchStart();
136
137 eventSender.cancelTouchPoint(2);
138 eventSender.touchCancel();
139
140 y += 50;
141 eventSender.updateTouchPoint(0, x0, y);
142 eventSender.updateTouchPoint(1, x2, y);
143 eventSender.touchMove();
144
145 eventSender.cancelTouchPoint(0);
146 eventSender.cancelTouchPoint(1);
147 eventSender.touchCancel();
148 }
149
122 function runTests() { 150 function runTests() {
123 debug("--- single drag tests ---"); 151 debug("--- single drag tests ---");
124 debug(""); 152 debug("");
125 153
126 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --"); 154 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --");
127 eventToPreventDefault = "-none-"; 155 eventToPreventDefault = "-none-";
128 testSingleDrag(false); 156 testSingleDrag(false);
129 debug(""); 157 debug("");
130 158
131 debug("-- preventDefault on pointermove, without uncanceledMoveCausesScroll -- "); 159 debug("-- preventDefault on pointermove, without uncanceledMoveCausesScroll -- ");
(...skipping 27 matching lines...) Expand all
159 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --"); 187 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --");
160 eventToPreventDefault = "-none-"; 188 eventToPreventDefault = "-none-";
161 testMultiDrag(false); 189 testMultiDrag(false);
162 debug(""); 190 debug("");
163 191
164 debug("-- preventDefault on none, with uncanceledMoveCausesScroll --"); 192 debug("-- preventDefault on none, with uncanceledMoveCausesScroll --");
165 eventToPreventDefault = "-none-"; 193 eventToPreventDefault = "-none-";
166 testMultiDrag(true); 194 testMultiDrag(true);
167 debug(""); 195 debug("");
168 196
197 debug("--- multi cancel tests ---");
198 debug("");
199 testMultiCancel();
200 debug("");
169 } 201 }
170 202
171 203
172 init(); 204 init();
173 if (window.eventSender) 205 if (window.eventSender)
174 runTests(); 206 runTests();
175 else 207 else
176 debug("This test requires eventSender"); 208 debug("This test requires eventSender");
177 209
178 </script> 210 </script>
OLDNEW
« no previous file with comments | « no previous file | LayoutTests/fast/events/pointerevents/touch-pointercancel-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698