| Index: LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
|
| diff --git a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
|
| index 63c2dbe99d726a9075f6fd5788cf37dcc3a4efd2..874177f2efd190c729e9e8ff9948fc3b765b8d78 100644
|
| --- a/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
|
| +++ b/LayoutTests/fast/events/touch/gesture/gesture-tap-active-state.html
|
| @@ -52,11 +52,13 @@ function runTests()
|
| return;
|
| }
|
|
|
| - if (window.testRunner) {
|
| - window.jsTestIsAsync = true;
|
| - testRunner.waitUntilDone();
|
| + if (!internals.fireActiveIntervalTimer) {
|
| + debug('Mocked timers are not supported by this platform');
|
| + return;
|
| }
|
|
|
| + internals.setActiveIntervalTimerInManualMode(document, true);
|
| +
|
| debug("Verify active isn't initially set");
|
| shouldBeFalse("isBoxActive()");
|
|
|
| @@ -64,17 +66,8 @@ function runTests()
|
| eventSender.gestureShowPress(50, 50);
|
| shouldBeTrue("isBoxActive()");
|
| eventSender.gestureTap(50, 50);
|
| - // FIXME: Enable after implementing mocked timers (http://crbug.com/319529)
|
| - // shouldBeTrue("isBoxActive()");
|
| - waitUntilActiveCleared();
|
| -}
|
| -
|
| -function waitUntilActiveCleared()
|
| -{
|
| - if (isBoxActive()) {
|
| - return setTimeout(waitUntilActiveCleared, 10);
|
| - }
|
| -
|
| + shouldBeTrue("isBoxActive()");
|
| + internals.fireActiveIntervalTimer(document);
|
| shouldBeFalse("isBoxActive()");
|
|
|
| debug("Verify tapdown,tapcancel on the element sets and clears active");
|
| @@ -87,16 +80,7 @@ function waitUntilActiveCleared()
|
| eventSender.gestureShowPress(50, 50);
|
| shouldBeTrue("isBoxActive()");
|
| eventSender.gestureTap(400, 250);
|
| - // FIXME: Remove after mocked timers added (http://crbug.com/319529)
|
| - waitUntilAnotherActiveCleared();
|
| -}
|
| -
|
| -function waitUntilAnotherActiveCleared()
|
| -{
|
| - if (isBoxActive()) {
|
| - return setTimeout(waitUntilAnotherActiveCleared, 10);
|
| - }
|
| -
|
| + internals.fireActiveIntervalTimer(document);
|
| shouldBeFalse("isBoxActive()");
|
|
|
| debug("Verify tapCancel elsewhere still clears active");
|
| @@ -121,8 +105,6 @@ function waitUntilAnotherActiveCleared()
|
| eventSender.releaseTouchPoint(0);
|
| eventSender.touchEnd();
|
| shouldBeTrue("isBoxActive()");
|
| -
|
| - finishJSTest();
|
| }
|
|
|
| runTests();
|
|
|