Remove GestureScrollUpdateWithoutPropagation event

content/shell/renderer/test_runner/event_sender.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 368 matching lines @@
   void TouchCancel();
   void TouchEnd();
   void LeapForward(int milliseconds);
   void BeginDragWithFiles(const std::vector<std::string>& files);
   void AddTouchPoint(gin::Arguments* args);
   void MouseDragBegin();
   void MouseDragEnd();
   void GestureScrollBegin(gin::Arguments* args);
   void GestureScrollEnd(gin::Arguments* args);
   void GestureScrollUpdate(gin::Arguments* args);
+  //TODO: Remove GestureScrollUpdateWithoutPropagation once CL 732483003 has
+  // landed
   void GestureScrollUpdateWithoutPropagation(gin::Arguments* args);
   void GestureTap(gin::Arguments* args);
   void GestureTapDown(gin::Arguments* args);
   void GestureShowPress(gin::Arguments* args);
   void GestureTapCancel(gin::Arguments* args);
   void GestureLongPress(gin::Arguments* args);
   void GestureLongTap(gin::Arguments* args);
   void GestureTwoFingerTap(gin::Arguments* args);
   void ContinuousMouseScrollBy(gin::Arguments* args);
   void MouseMoveTo(gin::Arguments* args);
@@ skipping 1340 matching lines @@
 
 void EventSender::GestureScrollEnd(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollEnd, args);
 }
 
 void EventSender::GestureScrollUpdate(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollUpdate, args);
 }
 
 void EventSender::GestureScrollUpdateWithoutPropagation(gin::Arguments* args) {
-  GestureEvent(WebInputEvent::GestureScrollUpdateWithoutPropagation, args);
+  GestureEvent(WebInputEvent::GestureScrollUpdate, args, true);
 }
 
 void EventSender::GestureTap(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureTap, args);
 }
 
 void EventSender::GestureTapDown(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureTapDown, args);
 }
 
@@ skipping 183 matching lines @@
   for (size_t i = 0; i < touch_points_.size(); ++i) {
     WebTouchPoint* touch_point = &touch_points_[i];
     if (touch_point->state == WebTouchPoint::StateReleased) {
       touch_points_.erase(touch_points_.begin() + i);
       --i;
     } else
       touch_point->state = WebTouchPoint::StateStationary;
   }
 }
 
+//TODO Remove preventPropagation from arguments once CL 732483003 has landed
 void EventSender::GestureEvent(WebInputEvent::Type type,
-                               gin::Arguments* args) {
+                               gin::Arguments* args,
+                               bool preventPropagation) {
   double x;
   double y;
   if (!args->GetNext(&x) || !args->GetNext(&y)) {
     args->ThrowError();
     return;
   }
 
   WebGestureEvent event;
   event.type = type;
 
   switch (type) {
     case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
+    {
+      if (!preventPropagation && !args->PeekNext().IsEmpty()) {
+        if (!args->GetNext(&preventPropagation)) {
+          args->ThrowError();
+          return;
+        }
+      }
+
       event.data.scrollUpdate.deltaX = static_cast<float>(x);
       event.data.scrollUpdate.deltaY = static_cast<float>(y);
+      event.data.scrollUpdate.preventPropagation = preventPropagation;
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       current_gesture_location_.x =
           current_gesture_location_.x + event.data.scrollUpdate.deltaX;
       current_gesture_location_.y =
           current_gesture_location_.y + event.data.scrollUpdate.deltaY;
       break;
+    }
     case WebInputEvent::GestureScrollBegin:
       current_gesture_location_ = WebPoint(x, y);
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       break;
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureFlingStart:
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       break;
@@ skipping 335 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content