Index: LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-listbox.html |
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-listbox.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-listbox.html |
index bdff4dd44196e550f0094d57f826448a3f748dec..9847c710e61c14f7c9d048e972cacd16d480ed2a 100644 |
--- a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-listbox.html |
+++ b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-listbox.html |
@@ -52,9 +52,10 @@ |
shouldBe('container.scrollTop', '0'); |
eventSender.gestureScrollBegin(gestureX, gestureY); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -itemHeight); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -itemHeight); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -10); |
+ // Prevent scroll to propagate by passing true for third parameter |
+ eventSender.gestureScrollUpdate(0, -itemHeight, true); |
+ eventSender.gestureScrollUpdate(0, -itemHeight, true); |
+ eventSender.gestureScrollUpdate(0, -10, true); |
eventSender.gestureScrollEnd(0, 0); |
debug("Flinging the list box should scroll the list, the scrolls should be locked to item boundaries"); |
@@ -64,10 +65,10 @@ |
resetScroll(); |
eventSender.gestureScrollBegin(gestureX, gestureY); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -fullyScrolled); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -300); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -100); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -100); |
+ eventSender.gestureScrollUpdate(0, -fullyScrolled, true); |
+ eventSender.gestureScrollUpdate(0, -300, true); |
+ eventSender.gestureScrollUpdate(0, -100, true); |
+ eventSender.gestureScrollUpdate(0, -100, true); |
eventSender.gestureScrollEnd(0, 0); |
debug("Flinging the list past the end shouldn't scroll containing div"); |
@@ -75,8 +76,8 @@ |
shouldBe('container.scrollTop', '0'); |
eventSender.gestureScrollBegin(gestureX, gestureY); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -30); |
- eventSender.gestureScrollUpdateWithoutPropagation(0, -30); |
+ eventSender.gestureScrollUpdate(0, -30, true); |
+ eventSender.gestureScrollUpdate(0, -30, true); |
eventSender.gestureScrollEnd(0, 0); |
debug("Flinging fully scrolled list should fling containing div"); |
@@ -130,7 +131,7 @@ |
eventSender.gestureScrollBegin(gestureX, gestureY); |
eventSender.gestureScrollUpdate(-30, 0); |
- eventSender.gestureScrollUpdateWithoutPropagation(-30, 0); |
+ eventSender.gestureScrollUpdate(-30, 0, true); |
eventSender.gestureScrollEnd(0, 0); |
debug("Horizontal scrolls should not affect listbox"); |
@@ -152,7 +153,7 @@ |
if (window.eventSender) { |
description('This tests that an input text field can be properly scrolled with touch gestures'); |
- if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWithoutPropagation) { |
+ if (checkTestDependencies() && window.eventSender.gestureScrollUpdate) { |
testFlingGestures(); |
testGestureScroll(); |
testHorizontalScroll(); |