| Index: LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
|
| diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
|
| index b46c16f350a9601cf38e8576a6f0186347b20bac..ef74728c12fad8d9f4c7f07e15d28375a9c57b2b 100644
|
| --- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
|
| +++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
|
| @@ -60,7 +60,7 @@ var scrollAmountY = ['0'];
|
| var wheelEventsOccurred = 0;
|
| var expectedWheelEventsOccurred = ['0'];
|
| var scrollEventsOccurred = 0;
|
| -var scrolledElement = 'movedbox'
|
| +var scrolledElement = 'movedbox';
|
| var scrollEventsOccurred = 0;
|
| var expectedScrollEventsOccurred = '1';
|
|
|
| @@ -72,10 +72,11 @@ function firstGestureScroll()
|
|
|
| debug("first gesture");
|
| eventSender.gestureScrollBegin(10, 72);
|
| - eventSender.gestureScrollUpdateWithoutPropagation(0, -700);
|
| - eventSender.gestureScrollUpdateWithoutPropagation(0, -100);
|
| - eventSender.gestureScrollUpdateWithoutPropagation(0, -70);
|
| - eventSender.gestureScrollUpdateWithoutPropagation(0, -10);
|
| + // Prevent scroll to propagate by passing true for third parameter
|
| + eventSender.gestureScrollUpdate(0, -700, true);
|
| + eventSender.gestureScrollUpdate(0, -100, true);
|
| + eventSender.gestureScrollUpdate(0, -70, true);
|
| + eventSender.gestureScrollUpdate(0, -10, true);
|
| eventSender.gestureScrollEnd(0, 0);
|
|
|
| // Make sure the actual iframe got fully scrolled
|
| @@ -98,8 +99,9 @@ function runTest()
|
| if (window.eventSender) {
|
| description('This tests that a gesture scroll is not propagated from an ' +
|
| 'iframe to an outer div when the iframe has no remaining ' +
|
| - 'scroll offset when the gesture type GestureScrollUpdateWithoutPropagation is used.');
|
| - if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWithoutPropagation)
|
| + 'scroll offset when the preventPropagation flag is set for the gesture '+
|
| + 'type GestureScrollUpdate.');
|
| + if (checkTestDependencies() && window.eventSender.gestureScrollUpdate)
|
| firstGestureScroll();
|
| else
|
| exitIfNecessary();
|
|
|