Merge 144519 "EventHandler::handleGestureScrollUpdate() should i..."

LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html

Index: LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html
===================================================================
--- LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html	(revision 145820)
+++ LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html	(working copy)
@@ -92,25 +92,6 @@
 var scrollEventsOccurred = 0;
 var expectedScrollEventsOccurred = '1';
 
-
-function recordScroll(event) {
-	debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target);
-	scrollEventsOccurred++;
-
-	if (window.eventSender) {
-		// Because scroll events arrive asynchronously, only one will arrive.
-	    if (gesturesOccurred == expectedGesturesTotal) {
-			shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred);
-	        // If we've got here, we've passed.
-	        successfullyParsed = true;
-	        isSuccessfullyParsed();
-	        if (window.testRunner)
-	            testRunner.notifyDone();
-		}
-    }
-}
-
-
 function firstGestureScroll()
 {
     debug("first gesture");
@@ -126,7 +107,8 @@
 {
     debug("second gesture");
     eventSender.gestureScrollBegin(12, 40);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -60);
+    eventSender.gestureScrollUpdateWithoutPropagation(0, -50);
+    eventSender.gestureScrollUpdateWithoutPropagation(0, -10);
     eventSender.gestureScrollEnd(0, 0);
 
     // Wait for layout.