Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 54 var x = rect.left + 50; | 54 var x = rect.left + 50; |
| 55 var y = rect.top + 50; | 55 var y = rect.top + 50; |
| 56 | 56 |
| 57 eventSender.addTouchPoint(x, y); | 57 eventSender.addTouchPoint(x, y); |
| 58 eventSender.touchStart(); | 58 eventSender.touchStart(); |
| 59 | 59 |
| 60 eventSender.updateTouchPoint(0, x, y+50); | 60 eventSender.updateTouchPoint(0, x, y+50); |
| 61 eventSender.touchMove(); | 61 eventSender.touchMove(); |
| 62 | 62 |
| 63 eventSender.updateTouchPoint(0, x, y+100); | 63 eventSender.updateTouchPoint(0, x, y+100); |
| 64 eventSender.touchMove(); | |
|
tdresser
2016/04/01 14:50:24
Why do we only notify after this touchMove, instea
mustaq
2016/04/01 18:31:04
I originally put it here to emphasize that pointer
tdresser
2016/04/01 19:03:20
Let's move the notification up.
| |
| 65 | |
| 64 if (uncanceledMoveCausesScroll) | 66 if (uncanceledMoveCausesScroll) |
| 65 eventSender.touchMoveCausingScrollIfUncanceled(); | 67 eventSender.notifyStartOfTouchScroll(); |
| 66 else | |
| 67 eventSender.touchMove(); | |
| 68 | 68 |
| 69 eventSender.updateTouchPoint(0, x, y+150); | 69 eventSender.updateTouchPoint(0, x, y+150); |
| 70 eventSender.touchMove(); | 70 eventSender.touchMove(); |
| 71 | 71 |
| 72 eventSender.releaseTouchPoint(0); | 72 eventSender.releaseTouchPoint(0); |
| 73 eventSender.touchEnd(); | 73 eventSender.touchEnd(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 function testMultiDrag(uncanceledMoveCausesScroll) { | 76 function testMultiDrag(uncanceledMoveCausesScroll) { |
| 77 var rect; | 77 var rect; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 91 y += 50; | 91 y += 50; |
| 92 eventSender.updateTouchPoint(0, x0, y); | 92 eventSender.updateTouchPoint(0, x0, y); |
| 93 eventSender.updateTouchPoint(1, x1, y); | 93 eventSender.updateTouchPoint(1, x1, y); |
| 94 eventSender.updateTouchPoint(2, x2, y); | 94 eventSender.updateTouchPoint(2, x2, y); |
| 95 eventSender.touchMove(); | 95 eventSender.touchMove(); |
| 96 | 96 |
| 97 y += 50; | 97 y += 50; |
| 98 eventSender.updateTouchPoint(0, x0, y); | 98 eventSender.updateTouchPoint(0, x0, y); |
| 99 eventSender.updateTouchPoint(1, x1, y); | 99 eventSender.updateTouchPoint(1, x1, y); |
| 100 eventSender.updateTouchPoint(2, x2, y); | 100 eventSender.updateTouchPoint(2, x2, y); |
| 101 eventSender.touchMove(); | |
| 102 | |
| 101 if (uncanceledMoveCausesScroll) | 103 if (uncanceledMoveCausesScroll) |
| 102 eventSender.touchMoveCausingScrollIfUncanceled(); | 104 eventSender.notifyStartOfTouchScroll(); |
| 103 else | |
| 104 eventSender.touchMove(); | |
| 105 | 105 |
| 106 eventSender.addTouchPoint(x3, y); | 106 eventSender.addTouchPoint(x3, y); |
| 107 eventSender.touchStart(); | 107 eventSender.touchStart(); |
| 108 | 108 |
| 109 y += 50; | 109 y += 50; |
| 110 eventSender.updateTouchPoint(0, x0, y); | 110 eventSender.updateTouchPoint(0, x0, y); |
| 111 eventSender.updateTouchPoint(1, x1, y); | 111 eventSender.updateTouchPoint(1, x1, y); |
| 112 eventSender.updateTouchPoint(2, x2, y); | 112 eventSender.updateTouchPoint(2, x2, y); |
| 113 eventSender.updateTouchPoint(3, x3, y); | 113 eventSender.updateTouchPoint(3, x3, y); |
| 114 eventSender.touchMove(); | 114 eventSender.touchMove(); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --"); | 154 debug("-- preventDefault on none, without uncanceledMoveCausesScroll --"); |
| 155 eventToPreventDefault = "-none-"; | 155 eventToPreventDefault = "-none-"; |
| 156 testSingleDrag(false); | 156 testSingleDrag(false); |
| 157 debug(""); | 157 debug(""); |
| 158 | 158 |
| 159 debug("-- preventDefault on pointermove, without uncanceledMoveCausesScroll -- "); | 159 debug("-- preventDefault on pointermove, without uncanceledMoveCausesScroll -- "); |
| 160 eventToPreventDefault = "pointermove"; | 160 eventToPreventDefault = "pointermove"; |
| 161 testSingleDrag(false); | 161 testSingleDrag(false); |
| 162 debug(""); | 162 debug(""); |
| 163 | 163 |
| 164 // TODO(mustaq): Scrolling is now independent of whether the TEs thru the even tSender gets | |
| 165 // preventDefaulted or not. Nuke preventDefault on touchmove, rename |uncancel edMoveCausesScroll|. | |
| 164 debug("-- preventDefault on touchmove, without uncanceledMoveCausesScroll --") ; | 166 debug("-- preventDefault on touchmove, without uncanceledMoveCausesScroll --") ; |
| 165 eventToPreventDefault = "touchmove"; | 167 eventToPreventDefault = "touchmove"; |
| 166 testSingleDrag(false); | 168 testSingleDrag(false); |
| 167 debug(""); | 169 debug(""); |
| 168 | 170 |
| 169 debug("-- preventDefault on none, with uncanceledMoveCausesScroll --"); | 171 debug("-- preventDefault on none, with uncanceledMoveCausesScroll --"); |
| 170 eventToPreventDefault = "-none-"; | 172 eventToPreventDefault = "-none-"; |
| 171 testSingleDrag(true); | 173 testSingleDrag(true); |
| 172 debug(""); | 174 debug(""); |
| 173 | 175 |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 201 } | 203 } |
| 202 | 204 |
| 203 | 205 |
| 204 init(); | 206 init(); |
| 205 if (window.eventSender) | 207 if (window.eventSender) |
| 206 runTests(); | 208 runTests(); |
| 207 else | 209 else |
| 208 debug("This test requires eventSender"); | 210 debug("This test requires eventSender"); |
| 209 | 211 |
| 210 </script> | 212 </script> |
| OLD | NEW |