OLD | NEW |
1 function recordWheel(event) | 1 function recordWheel(event) |
2 { | 2 { |
3 debug('wheel event ' + wheelEventsOccurred + '+> ' + event.target); | 3 debug('wheel event ' + wheelEventsOccurred + '+> ' + event.target); |
4 wheelEventsOccurred++; | 4 wheelEventsOccurred++; |
5 } | 5 } |
6 | 6 |
7 function recordScroll(event) | 7 function recordScroll(event) |
8 { | 8 { |
9 debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target); | 9 debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target); |
10 scrollEventsOccurred++; | 10 scrollEventsOccurred++; |
11 | 11 |
12 if (window.eventSender) { | 12 if (window.eventSender) { |
13 // Because scroll events arrive asynchronously, only one will arrive. | 13 // Because scroll events arrive asynchronously, only one will arrive. |
14 if (gesturesOccurred == expectedGesturesTotal) { | 14 if (gesturesOccurred == expectedGesturesTotal) { |
15 shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred); | 15 shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred); |
16 // If we've got here, we've passed. | 16 if (window.jsTestIsAsync) { |
17 successfullyParsed = true; | 17 finishJSTest(); |
18 isSuccessfullyParsed(); | 18 } else { |
19 if (window.testRunner) | 19 // If we've got here, we've passed. |
20 testRunner.notifyDone(); | 20 successfullyParsed = true; |
| 21 isSuccessfullyParsed(); |
| 22 if (window.testRunner) |
| 23 testRunner.notifyDone(); |
| 24 } |
21 } | 25 } |
22 } | 26 } |
23 } | 27 } |
24 | 28 |
25 function exitIfNecessary() | 29 function exitIfNecessary() |
26 { | 30 { |
27 debug('gesture events not implemented on this platform or gesture event scro
lling of a document is broken'); | 31 debug('gesture events not implemented on this platform or gesture event scro
lling of a document is broken'); |
28 successfullyParsed = true; | 32 if (window.jsTestIsAsync) { |
29 isSuccessfullyParsed(); | 33 finishJSTest(); |
30 if (window.testRunner) | 34 } else { |
31 testRunner.notifyDone(); | 35 // If we've got here, we've passed. |
| 36 successfullyParsed = true; |
| 37 isSuccessfullyParsed(); |
| 38 if (window.testRunner) |
| 39 testRunner.notifyDone(); |
| 40 } |
32 } | 41 } |
33 | 42 |
34 function checkTestDependencies() | 43 function checkTestDependencies() |
35 { | 44 { |
36 return eventSender.gestureScrollBegin && eventSender.gestureScrollUpdate &&
eventSender.gestureScrollEnd; | 45 return eventSender.gestureScrollBegin && eventSender.gestureScrollUpdate &&
eventSender.gestureScrollEnd; |
37 } | 46 } |
38 | 47 |
39 function checkScrollOffset() | 48 function checkScrollOffset() |
40 { | 49 { |
41 if (window.eventSender) { | 50 if (window.eventSender) { |
42 shouldBe(scrolledElement + '.' + 'scrollTop', scrollAmountY[gesturesOccu
rred]); | 51 shouldBe(scrolledElement + '.' + 'scrollTop', scrollAmountY[gesturesOccu
rred]); |
43 shouldBe(scrolledElement + '.' + 'scrollLeft', scrollAmountX[gesturesOcc
urred]); | 52 shouldBe(scrolledElement + '.' + 'scrollLeft', scrollAmountX[gesturesOcc
urred]); |
44 shouldBe('wheelEventsOccurred', expectedWheelEventsOccurred[gesturesOccu
rred]); | 53 shouldBe('wheelEventsOccurred', expectedWheelEventsOccurred[gesturesOccu
rred]); |
45 gesturesOccurred++; | 54 gesturesOccurred++; |
46 } | 55 } |
47 if (gesturesOccurred < expectedGesturesTotal) { | 56 if (gesturesOccurred < expectedGesturesTotal) { |
48 wheelEventsOccurred = 0; | 57 wheelEventsOccurred = 0; |
49 secondGestureScroll(); | 58 secondGestureScroll(); |
50 } | 59 } |
51 } | 60 } |
OLD | NEW |