| OLD | NEW |
| 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> | 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> |
| 2 <script src="../../../resources/js-test.js"></script> | 2 <script src="../../../resources/js-test.js"></script> |
| 3 <style type="text/css"> | 3 <style type="text/css"> |
| 4 body { | 4 body { |
| 5 height: 2000px; | 5 height: 2000px; |
| 6 width: 2000px; | 6 width: 2000px; |
| 7 } | 7 } |
| 8 </style> | 8 </style> |
| 9 <script> | 9 <script> |
| 10 | 10 |
| 11 var expectedScrollsTotal = 2; | 11 var expectedScrollsTotal = 2; |
| 12 var scrollsOccurred = 0; | 12 var scrollsOccurred = 0; |
| 13 var scrollAmountX = ['1', '3']; | 13 var scrollAmountX = ['1', '3']; |
| 14 var scrollAmountY = ['1', '3']; | 14 var scrollAmountY = ['1', '3']; |
| 15 /* TODO(oshima): Move the scaling to eventSender */ | |
| 16 var dpr = window.devicePixelRatio; | |
| 17 | 15 |
| 18 function checkScrollOffset() | 16 function checkScrollOffset() |
| 19 { | 17 { |
| 20 if (window.eventSender) { | 18 if (window.eventSender) { |
| 21 shouldBe('document.scrollingElement.scrollTop', scrollAmountY[scrollsOcc
urred]); | 19 shouldBe('document.scrollingElement.scrollTop', scrollAmountY[scrollsOcc
urred]); |
| 22 shouldBe('document.scrollingElement.scrollLeft', scrollAmountX[scrollsOc
curred]); | 20 shouldBe('document.scrollingElement.scrollLeft', scrollAmountX[scrollsOc
curred]); |
| 23 scrollsOccurred++; | 21 scrollsOccurred++; |
| 24 } | 22 } |
| 25 | 23 |
| 26 if (scrollsOccurred == expectedScrollsTotal) { | 24 if (scrollsOccurred == expectedScrollsTotal) { |
| 27 // If we've got here, we've passed. | 25 // If we've got here, we've passed. |
| 28 isSuccessfullyParsed(); | 26 isSuccessfullyParsed(); |
| 29 if (window.testRunner) | 27 if (window.testRunner) |
| 30 testRunner.notifyDone(); | 28 testRunner.notifyDone(); |
| 31 } else { | 29 } else { |
| 32 secondGestureScrollSequence(); | 30 secondGestureScrollSequence(); |
| 33 } | 31 } |
| 34 } | 32 } |
| 35 | 33 |
| 36 function firstGestureScrollSequence() | 34 function firstGestureScrollSequence() |
| 37 { | 35 { |
| 38 debug("first gesture"); | 36 debug("first gesture"); |
| 39 | 37 |
| 40 eventSender.gestureScrollBegin(50, 50); | 38 eventSender.gestureScrollBegin(50, 50); |
| 41 eventSender.gestureScrollUpdate(-dpr, -dpr); | 39 eventSender.gestureScrollUpdate(-1, -1); |
| 42 eventSender.gestureScrollEnd(0, 0); | 40 eventSender.gestureScrollEnd(0, 0); |
| 43 | 41 |
| 44 // Wait for layout. | 42 // Wait for layout. |
| 45 checkScrollOffset(); | 43 checkScrollOffset(); |
| 46 } | 44 } |
| 47 | 45 |
| 48 function secondGestureScrollSequence() | 46 function secondGestureScrollSequence() |
| 49 { | 47 { |
| 50 debug("second gesture"); | 48 debug("second gesture"); |
| 51 | 49 |
| 52 eventSender.gestureScrollBegin(50, 50); | 50 eventSender.gestureScrollBegin(50, 50); |
| 53 eventSender.gestureScrollUpdate(-2 * dpr, -2 * dpr); | 51 eventSender.gestureScrollUpdate(-2, -2); |
| 54 eventSender.gestureScrollEnd(0, 0); | 52 eventSender.gestureScrollEnd(0, 0); |
| 55 | 53 |
| 56 // Wait for layout. | 54 // Wait for layout. |
| 57 checkScrollOffset(); | 55 checkScrollOffset(); |
| 58 } | 56 } |
| 59 | 57 |
| 60 function exitIfNecessary() | 58 function exitIfNecessary() |
| 61 { | 59 { |
| 62 debug('Gesture events not implemented on this platform or broken'); | 60 debug('Gesture events not implemented on this platform or broken'); |
| 63 isSuccessfullyParsed(); | 61 isSuccessfullyParsed(); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 77 if (eventSender.clearTouchPoints) | 75 if (eventSender.clearTouchPoints) |
| 78 firstGestureScrollSequence(); | 76 firstGestureScrollSequence(); |
| 79 else | 77 else |
| 80 exitIfNecessary(); | 78 exitIfNecessary(); |
| 81 } else { | 79 } else { |
| 82 debug("This test requires eventSender."); | 80 debug("This test requires eventSender."); |
| 83 } | 81 } |
| 84 } | 82 } |
| 85 </script> | 83 </script> |
| 86 <body onload="runTest()"></body> | 84 <body onload="runTest()"></body> |
| OLD | NEW |