Enable sending gesture events from layout tests

content/shell/renderer/test_runner/event_sender.cc

Index: content/shell/renderer/test_runner/event_sender.cc
diff --git a/content/shell/renderer/test_runner/event_sender.cc b/content/shell/renderer/test_runner/event_sender.cc
index b113fb7077b2c948cece87a371a7dc2435a93f78..d31253c628b92e2a956d2b894771d8fd2a3e1c16 100644
--- a/content/shell/renderer/test_runner/event_sender.cc
+++ b/content/shell/renderer/test_runner/event_sender.cc
@@ -396,6 +396,9 @@ class EventSenderBindings : public gin::Wrappable<EventSenderBindings> {
   void GestureScrollBegin(gin::Arguments* args);
   void GestureScrollEnd(gin::Arguments* args);
   void GestureScrollUpdate(gin::Arguments* args);
+  void GesturePinchBegin(gin::Arguments* args);
+  void GesturePinchEnd(gin::Arguments* args);
+  void GesturePinchUpdate(gin::Arguments* args);
   void GestureTap(gin::Arguments* args);
   void GestureTapDown(gin::Arguments* args);
   void GestureShowPress(gin::Arguments* args);
@@ -526,6 +529,9 @@ EventSenderBindings::GetObjectTemplateBuilder(v8::Isolate* isolate) {
       .SetMethod("gestureScrollEnd", &EventSenderBindings::GestureScrollEnd)
       .SetMethod("gestureScrollUpdate",
                  &EventSenderBindings::GestureScrollUpdate)
+      .SetMethod("gesturePinchBegin", &EventSenderBindings::GesturePinchBegin)
+      .SetMethod("gesturePinchEnd", &EventSenderBindings::GesturePinchEnd)
+      .SetMethod("gesturePinchUpdate", &EventSenderBindings::GesturePinchUpdate)
       .SetMethod("gestureTap", &EventSenderBindings::GestureTap)
       .SetMethod("gestureTapDown", &EventSenderBindings::GestureTapDown)
       .SetMethod("gestureShowPress", &EventSenderBindings::GestureShowPress)
@@ -785,6 +791,21 @@ void EventSenderBindings::GestureScrollUpdate(gin::Arguments* args) {
     sender_->GestureScrollUpdate(args);
 }
 
+void EventSenderBindings::GesturePinchBegin(gin::Arguments* args) {
+  if (sender_)
+    sender_->GesturePinchBegin(args);
+}
+
+void EventSenderBindings::GesturePinchEnd(gin::Arguments* args) {
+  if (sender_)
+    sender_->GesturePinchEnd(args);
+}
+
+void EventSenderBindings::GesturePinchUpdate(gin::Arguments* args) {
+  if (sender_)
+    sender_->GesturePinchUpdate(args);
+}
+
 void EventSenderBindings::GestureTap(gin::Arguments* args) {
   if (sender_)
     sender_->GestureTap(args);
@@ -1749,6 +1770,18 @@ void EventSender::GestureScrollUpdate(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollUpdate, args);
 }
 
+void EventSender::GesturePinchBegin(gin::Arguments* args) {
+  GestureEvent(WebInputEvent::GesturePinchBegin, args);
+}
+
+void EventSender::GesturePinchEnd(gin::Arguments* args) {
+  GestureEvent(WebInputEvent::GesturePinchEnd, args);
+}
+
+void EventSender::GesturePinchUpdate(gin::Arguments* args) {
+  GestureEvent(WebInputEvent::GesturePinchUpdate, args);
+}
+
 void EventSender::GestureTap(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureTap, args);
 }
@@ -1952,6 +1985,30 @@ void EventSender::SendCurrentTouchEvent(WebInputEvent::Type type) {
 
 void EventSender::GestureEvent(WebInputEvent::Type type,
                                gin::Arguments* args) {
+  WebGestureEvent event;
+  event.type = type;
+
+  // If the first argument is a string, it is to specify the device, otherwise
+  // the device is assumed to be a touchpad (this arrangement is because of
+  // a number of of pre-existing tests that made this assumption before this
+  // argument was added).

[Rick Byers, 2015/01/29 21:35:01]

are you sure about this part in the parens?  I believe the only type of gesture
events blink handles are touchscreen ones so all the existing code probably just
assumes it's touchscreen (touchpad fling gestures get handled by cc, but IIRC,
aren't passed to blink).  Doing this right probably means updating all existing
layout tests in fast/events/touch/gesture to specify  touchscreen.  Can you make
touchscreen the default instead?

[ccameron, 2015/01/29 21:54:09]

Oh -- I was going based on the undefined value's actual value (to the extent
that it was observed empirically), not the intention of the tests.

Updated the default to be touchscreen, and I'll see if the layout tests still
pass (if they don't, there are probably bugs to fix).

+  event.sourceDevice = blink::WebGestureDeviceTouchpad;
+  if (args->PeekNext()->IsString()) {
+    std::string device_string;
+    if (!args->GetNext(&device_string)) {
+      args->ThrowError();
+      return;
+    }
+    if (device_string == "touchpad") {
+      event.sourceDevice = blink::WebGestureDeviceTouchpad;
+    } else if (device_string == "touchscreen") {
+      event.sourceDevice = blink::WebGestureDeviceTouchscreen;
+    } else {
+      args->ThrowError();
+      return;
+    }
+  }
+
   double x;
   double y;
   if (!args->GetNext(&x) || !args->GetNext(&y)) {
@@ -1959,9 +2016,6 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
     return;
   }
 
-  WebGestureEvent event;
-  event.type = type;
-
   switch (type) {
     case WebInputEvent::GestureScrollUpdate:
     {
@@ -1994,6 +2048,27 @@ void EventSender::GestureEvent(WebInputEvent::Type type,
       event.x = current_gesture_location_.x;
       event.y = current_gesture_location_.y;
       break;
+    case WebInputEvent::GesturePinchBegin:
+    case WebInputEvent::GesturePinchEnd:
+      current_gesture_location_ = WebPoint(x, y);
+      event.x = current_gesture_location_.x;
+      event.y = current_gesture_location_.y;
+      break;
+    case WebInputEvent::GesturePinchUpdate:
+    {
+      float scale = 1;
+      if (!args->PeekNext().IsEmpty()) {
+        if (!args->GetNext(&scale)) {
+          args->ThrowError();
+          return;
+        }
+      }
+      event.data.pinchUpdate.scale = scale;
+      current_gesture_location_ = WebPoint(x, y);
+      event.x = current_gesture_location_.x;
+      event.y = current_gesture_location_.y;
+      break;
+    }
     case WebInputEvent::GestureTap:
     {
       float tap_count = 1;