Add API to event_sender.

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 339 matching lines @@
   void GestureScrollFirstPoint(int x, int y);
   void TouchStart();
   void TouchMove();
   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 MouseMomentumBegin();
   void GestureScrollBegin(gin::Arguments* args);
   void GestureScrollEnd(gin::Arguments* args);
   void GestureScrollUpdate(gin::Arguments* args);
   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);
+  void TrackpadScrollBegin(gin::Arguments* args);

[jochen (gone - plz use gerrit), 2014/05/15 15:30:45]

begin and end don't seem to use args?

[erikchen, 2014/05/15 16:23:04]

right you are. I've removed the parameter from the functions.

+  void TrackpadScroll(gin::Arguments* args);
+  void TrackpadScrollEnd(gin::Arguments* args);
   void MouseScrollBy(gin::Arguments* args);
+  // TODO(erikchen): Remove MouseMomentumBegin once CL 282743002 has landed.
+  void MouseMomentumBegin();
+  void MouseMomentumBegin2(gin::Arguments* args);
   void MouseMomentumScrollBy(gin::Arguments* args);
   void MouseMomentumEnd();
   void ScheduleAsynchronousClick(gin::Arguments* args);
   void ScheduleAsynchronousKeyDown(gin::Arguments* args);
   void MouseDown(gin::Arguments* args);
   void MouseUp(gin::Arguments* args);
   void KeyDown(gin::Arguments* args);
 
   // Binding properties:
   bool ForceLayoutOnEvents() const;
@@ skipping 88 matching lines @@
                  &EventSenderBindings::GestureScrollFirstPoint)
       .SetMethod("touchStart", &EventSenderBindings::TouchStart)
       .SetMethod("touchMove", &EventSenderBindings::TouchMove)
       .SetMethod("touchCancel", &EventSenderBindings::TouchCancel)
       .SetMethod("touchEnd", &EventSenderBindings::TouchEnd)
       .SetMethod("leapForward", &EventSenderBindings::LeapForward)
       .SetMethod("beginDragWithFiles", &EventSenderBindings::BeginDragWithFiles)
       .SetMethod("addTouchPoint", &EventSenderBindings::AddTouchPoint)
       .SetMethod("mouseDragBegin", &EventSenderBindings::MouseDragBegin)
       .SetMethod("mouseDragEnd", &EventSenderBindings::MouseDragEnd)
-      .SetMethod("mouseMomentumBegin", &EventSenderBindings::MouseMomentumBegin)
       .SetMethod("gestureScrollBegin", &EventSenderBindings::GestureScrollBegin)
       .SetMethod("gestureScrollEnd", &EventSenderBindings::GestureScrollEnd)
       .SetMethod("gestureScrollUpdate",
                  &EventSenderBindings::GestureScrollUpdate)
       .SetMethod("gestureScrollUpdateWithoutPropagation",
                  &EventSenderBindings::GestureScrollUpdateWithoutPropagation)
       .SetMethod("gestureTap", &EventSenderBindings::GestureTap)
       .SetMethod("gestureTapDown", &EventSenderBindings::GestureTapDown)
       .SetMethod("gestureShowPress", &EventSenderBindings::GestureShowPress)
       .SetMethod("gestureTapCancel", &EventSenderBindings::GestureTapCancel)
       .SetMethod("gestureLongPress", &EventSenderBindings::GestureLongPress)
       .SetMethod("gestureLongTap", &EventSenderBindings::GestureLongTap)
       .SetMethod("gestureTwoFingerTap",
                  &EventSenderBindings::GestureTwoFingerTap)
       .SetMethod("continuousMouseScrollBy",
                  &EventSenderBindings::ContinuousMouseScrollBy)
       .SetMethod("keyDown", &EventSenderBindings::KeyDown)
       .SetMethod("mouseDown", &EventSenderBindings::MouseDown)
       .SetMethod("mouseMoveTo", &EventSenderBindings::MouseMoveTo)
+      .SetMethod("trackpadScrollBegin",
+                 &EventSenderBindings::TrackpadScrollBegin)
+      .SetMethod("trackpadScroll", &EventSenderBindings::TrackpadScroll)
+      .SetMethod("trackpadScrollEnd", &EventSenderBindings::TrackpadScrollEnd)
       .SetMethod("mouseScrollBy", &EventSenderBindings::MouseScrollBy)
       .SetMethod("mouseUp", &EventSenderBindings::MouseUp)
+      .SetMethod("mouseMomentumBegin", &EventSenderBindings::MouseMomentumBegin)
+      .SetMethod("mouseMomentumBegin2",
+                 &EventSenderBindings::MouseMomentumBegin2)
       .SetMethod("mouseMomentumScrollBy",
                  &EventSenderBindings::MouseMomentumScrollBy)
       .SetMethod("mouseMomentumEnd", &EventSenderBindings::MouseMomentumEnd)
       .SetMethod("scheduleAsynchronousClick",
                  &EventSenderBindings::ScheduleAsynchronousClick)
       .SetMethod("scheduleAsynchronousKeyDown",
                  &EventSenderBindings::ScheduleAsynchronousKeyDown)
       .SetProperty("forceLayoutOnEvents",
                    &EventSenderBindings::ForceLayoutOnEvents,
                    &EventSenderBindings::SetForceLayoutOnEvents)
@@ skipping 188 matching lines @@
 void EventSenderBindings::MouseDragBegin() {
   if (sender_)
     sender_->MouseDragBegin();
 }
 
 void EventSenderBindings::MouseDragEnd() {
   if (sender_)
     sender_->MouseDragEnd();
 }
 
-void EventSenderBindings::MouseMomentumBegin() {
-  if (sender_)
-    sender_->MouseMomentumBegin();
-}
-
 void EventSenderBindings::GestureScrollBegin(gin::Arguments* args) {
   if (sender_)
     sender_->GestureScrollBegin(args);
 }
 
 void EventSenderBindings::GestureScrollEnd(gin::Arguments* args) {
   if (sender_)
     sender_->GestureScrollEnd(args);
 }
 
@@ skipping 46 matching lines @@
 void EventSenderBindings::ContinuousMouseScrollBy(gin::Arguments* args) {
   if (sender_)
     sender_->ContinuousMouseScrollBy(args);
 }
 
 void EventSenderBindings::MouseMoveTo(gin::Arguments* args) {
   if (sender_)
     sender_->MouseMoveTo(args);
 }
 
+void EventSenderBindings::TrackpadScrollBegin(gin::Arguments* args) {
+  if (sender_)
+    sender_->TrackpadScrollBegin(args);
+}
+
+void EventSenderBindings::TrackpadScroll(gin::Arguments* args) {
+  if (sender_)
+    sender_->TrackpadScroll(args);
+}
+
+void EventSenderBindings::TrackpadScrollEnd(gin::Arguments* args) {
+  if (sender_)
+    sender_->TrackpadScrollEnd(args);
+}
+
 void EventSenderBindings::MouseScrollBy(gin::Arguments* args) {
   if (sender_)
     sender_->MouseScrollBy(args);
 }
 
+void EventSenderBindings::MouseMomentumBegin() {
+  if (sender_)
+    sender_->MouseMomentumBegin();
+}
+
+void EventSenderBindings::MouseMomentumBegin2(gin::Arguments* args) {
+  if (sender_)
+    sender_->MouseMomentumBegin2(args);
+}
+
 void EventSenderBindings::MouseMomentumScrollBy(gin::Arguments* args) {
   if (sender_)
     sender_->MouseMomentumScrollBy(args);
 }
 
 void EventSenderBindings::MouseMomentumEnd() {
   if (sender_)
     sender_->MouseMomentumEnd();
 }
 
@@ skipping 838 matching lines @@
                  last_mouse_pos_,
                  GetCurrentEventTimeSec(),
                  click_count_,
                  0,
                  &event);
   event.phase = WebMouseWheelEvent::PhaseEnded;
   event.hasPreciseScrollingDeltas = true;
   view_->handleInputEvent(event);
 }
 
-void EventSender::MouseMomentumBegin() {
-  WebMouseWheelEvent event;
-  InitMouseEvent(WebInputEvent::MouseWheel,
-                 WebMouseEvent::ButtonNone,
-                 last_mouse_pos_,
-                 GetCurrentEventTimeSec(),
-                 click_count_,
-                 0,
-                 &event);
-  event.momentumPhase = WebMouseWheelEvent::PhaseBegan;
-  event.hasPreciseScrollingDeltas = true;
-  view_->handleInputEvent(event);
-}
-
 void EventSender::GestureScrollBegin(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollBegin, args);
 }
 
 void EventSender::GestureScrollEnd(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollEnd, args);
 }
 
 void EventSender::GestureScrollUpdate(gin::Arguments* args) {
   GestureEvent(WebInputEvent::GestureScrollUpdate, args);
@@ skipping 64 matching lines @@
                    pressed_button_,
                    mouse_pos,
                    GetCurrentEventTimeSec(),
                    click_count_,
                    modifiers,
                    &event);
     DoMouseMove(event);
   }
 }
 
+void EventSender::TrackpadScrollBegin(gin::Arguments* args) {
+  WebMouseWheelEvent event;
+  InitMouseEvent(WebInputEvent::MouseWheel,
+                 WebMouseEvent::ButtonNone,
+                 last_mouse_pos_,
+                 GetCurrentEventTimeSec(),
+                 click_count_,
+                 0,
+                 &event);
+  event.phase = blink::WebMouseWheelEvent::PhaseBegan;
+  event.hasPreciseScrollingDeltas = true;
+  view_->handleInputEvent(event);
+}
+
+void EventSender::TrackpadScroll(gin::Arguments* args) {
+  WebMouseWheelEvent event;
+  InitMouseWheelEvent(args, true, &event);
+  event.phase = blink::WebMouseWheelEvent::PhaseChanged;
+  event.hasPreciseScrollingDeltas = true;
+  view_->handleInputEvent(event);
+}
+
+void EventSender::TrackpadScrollEnd(gin::Arguments* args) {
+  WebMouseWheelEvent event;
+  InitMouseEvent(WebInputEvent::MouseWheel,
+                 WebMouseEvent::ButtonNone,
+                 last_mouse_pos_,
+                 GetCurrentEventTimeSec(),
+                 click_count_,
+                 0,
+                 &event);
+  event.phase = WebMouseWheelEvent::PhaseEnded;
+  event.hasPreciseScrollingDeltas = true;
+  view_->handleInputEvent(event);
+}
+
 void EventSender::MouseScrollBy(gin::Arguments* args) {
    WebMouseWheelEvent event;
   InitMouseWheelEvent(args, false, &event);
   view_->handleInputEvent(event);
 }
 
+void EventSender::MouseMomentumBegin() {
+  WebMouseWheelEvent event;
+  InitMouseEvent(WebInputEvent::MouseWheel,
+                 WebMouseEvent::ButtonNone,
+                 last_mouse_pos_,
+                 GetCurrentEventTimeSec(),
+                 click_count_,
+                 0,
+                 &event);
+  event.momentumPhase = WebMouseWheelEvent::PhaseBegan;
+  event.hasPreciseScrollingDeltas = true;
+  view_->handleInputEvent(event);
+}
+
+void EventSender::MouseMomentumBegin2(gin::Arguments* args) {
+  WebMouseWheelEvent event;
+  InitMouseWheelEvent(args, true, &event);
+  event.momentumPhase = WebMouseWheelEvent::PhaseBegan;
+  event.hasPreciseScrollingDeltas = true;
+  view_->handleInputEvent(event);
+}
+
 void EventSender::MouseMomentumScrollBy(gin::Arguments* args) {
   WebMouseWheelEvent event;
   InitMouseWheelEvent(args, true, &event);
   event.momentumPhase = WebMouseWheelEvent::PhaseChanged;
   event.hasPreciseScrollingDeltas = true;
   view_->handleInputEvent(event);
 }
 
 void EventSender::MouseMomentumEnd() {
   WebMouseWheelEvent event;
@@ skipping 405 matching lines @@
       }
       default:
         NOTREACHED();
     }
   }
 
   replaying_saved_events_ = false;
 }
 
 }  // namespace content