Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / fast / events / touch / gesture / pad-gesture-fling.js

diff --git a/src/third_party/WebKit/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.js b/src/third_party/WebKit/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.js
index 7057c45..2083790 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.js
+++ b/src/third_party/WebKit/LayoutTests/fast/events/touch/gesture/pad-gesture-fling.js
@@ -4,9 +4,9 @@ var actualWheelEventsOccurred = 0;
 var cumulativeScrollX = 0;
 var cumulativeScrollY = 0;
 
-var minimumWheelEventsExpected = 40;
-var minimumScrollXExpected = "200";
-var minimumScrollYExpected = "200";
+var minimumWheelEventsExpected = "2";
+var minimumScrollXExpected = 300;
+var minimumScrollYExpected = 300;
 
 var positionX = 10;
 var positionY = 11;
@@ -25,14 +25,17 @@ function recordWheelEvent(event)
     cumulativeScrollX += event.wheelDeltaX;
     cumulativeScrollY += event.wheelDeltaY;
 
-    if (actualWheelEventsOccurred == minimumWheelEventsExpected) {
-      shouldBeGreaterThanOrEqual('cumulativeScrollX', minimumScrollXExpected);
-      shouldBeGreaterThanOrEqual('cumulativeScrollY', minimumScrollYExpected);
+    if (cumulativeScrollX >= minimumScrollXExpected
+            && cumulativeScrollY >= minimumScrollYExpected) {
+      shouldBeGreaterThanOrEqual('actualWheelEventsOccurred', minimumWheelEventsExpected);
+      shouldBeGreaterThanOrEqual('cumulativeScrollX', minimumScrollXExpected.toString());
+      shouldBeGreaterThanOrEqual('cumulativeScrollY', minimumScrollYExpected.toString());
 
       isSuccessfullyParsed();
       if (window.testRunner)
           testRunner.notifyDone();
     }
+    event.preventDefault();
 }
 
 document.addEventListener("mousewheel", recordWheelEvent);