added mouse wheel command

nataliakoval · nataliakoval · commit 0d9b4f0b632b · 2014-03-19T14:26:32.000+02:00
diff --git a/inc/commands/mouse_commands.h b/inc/commands/mouse_commands.h
@@ -55,6 +55,7 @@ class HoverCommand : public ElementCommand {
 /// - /session/:sessionId/buttondown
 /// - /session/:sessionId/buttonup
 /// - /session/:sessionId/doubleclick
+/// - /session/:sessionId/wheel
 class AdvancedMouseCommand : public ViewCommand {
 public:
     AdvancedMouseCommand(const std::vector<std::string>& path_segments,
@@ -158,6 +159,25 @@ class DoubleClickCommand : public AdvancedMouseCommand {
     DISALLOW_COPY_AND_ASSIGN(DoubleClickCommand);
 };
 
+/// Scrolls the wheel of the mouse by the given number of ticks, where a positive
+/// number indicates a downward scroll (wheel was rotated forwards away from the user)
+/// and a negative is upward scroll (wheel was rotated backwards toward the user).
+
+class WheelCommand : public AdvancedMouseCommand {
+public:
+    WheelCommand(const std::vector<std::string>& path_segments,
+               const base::DictionaryValue* const parameters);
+    virtual ~WheelCommand();
+
+    virtual bool Init(Response* const response) OVERRIDE;
+    virtual void ExecutePost(Response* const response) OVERRIDE;
+
+private:
+    int ticks_;
+
+    DISALLOW_COPY_AND_ASSIGN(WheelCommand);
+};
+
 }  // namespace webdriver
 
 #endif  // WEBDRIVER_COMMANDS_MOUSE_COMMANDS_H_
diff --git a/inc/extension_qt/graphics_web_view_executor.h b/inc/extension_qt/graphics_web_view_executor.h
@@ -59,6 +59,7 @@ class GraphicsWebViewCmdExecutor : public ViewCmdExecutor {
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
     virtual void MouseClick(MouseButton button, Error** error);
+    virtual void MouseWheel(const int delta, Error **error);
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, Error** error);
diff --git a/inc/extension_qt/qml_view_executor.h b/inc/extension_qt/qml_view_executor.h
@@ -43,6 +43,7 @@ class QQmlViewCmdExecutor : public QViewCmdExecutor {
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
     virtual void MouseClick(MouseButton button, Error** error);
+    virtual void MouseWheel(const int delta, Error **error);
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, Error** error);
diff --git a/inc/extension_qt/quick2_view_executor.h b/inc/extension_qt/quick2_view_executor.h
@@ -41,7 +41,8 @@ class Quick2ViewCmdExecutor : public QWindowViewCmdExecutor {
     virtual void MouseDoubleClick(Error** error);
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
-    virtual void MouseClick(MouseButton button, Error** error);
+    virtual void MouseClick(MouseButton button, Error** error);    
+    virtual void MouseWheel(const int delta, Error **error);
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, Error** error);
diff --git a/inc/extension_qt/web_view_executor.h b/inc/extension_qt/web_view_executor.h
@@ -56,6 +56,7 @@ class QWebViewCmdExecutor : public QViewCmdExecutor {
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
     virtual void MouseClick(MouseButton button, Error** error);
+    virtual void MouseWheel(const int delta, Error **error);
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, Error** error);
diff --git a/inc/extension_qt/widget_view_executor.h b/inc/extension_qt/widget_view_executor.h
@@ -38,6 +38,7 @@ class QWidgetViewCmdExecutor : public QViewCmdExecutor {
     virtual void MouseButtonUp(Error** error);
     virtual void MouseButtonDown(Error** error);
     virtual void MouseClick(MouseButton button, Error** error);
+    virtual void MouseWheel(const int delta, Error **error);
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, int x_offset, const int y_offset, Error** error);
     virtual void MouseMove(const ElementId& element, Error** error);
diff --git a/inc/webdriver_route_patterns.h b/inc/webdriver_route_patterns.h
@@ -45,6 +45,7 @@ class CommandRoutes {
     static const char kMouseButtonDown[];
     static const char kMouseButtonUp[];
     static const char kMouseMoveTo[];
+    static const char kMouseWheel[];
     static const char kClearElement[];
     static const char kSendKeysToElement[];
     static const char kSubmitElement[];
diff --git a/inc/webdriver_route_table.h b/inc/webdriver_route_table.h
@@ -59,6 +59,7 @@
 /// - kMouseButtonDown[]            = "/session/*/buttondown";
 /// - kMouseButtonUp[]              = "/session/*/buttonup";
 /// - kMouseMoveTo[]                = "/session/*/moveto";
+/// - kMouseWheel[]                 = "/session/*/wheel";
 /// - kFindElement[]                = "/session/*/element";
 /// - kFindElements[]               = "/session/*/elements";
 /// - kClearElement[]               = "/session/*/element/*/clear";
diff --git a/inc/webdriver_view_executor.h b/inc/webdriver_view_executor.h
@@ -83,6 +83,7 @@ class ViewCmdExecutor{
     virtual void MouseButtonUp(Error** error) = 0;
     virtual void MouseButtonDown(Error** error) = 0;
     virtual void MouseClick(MouseButton button, Error** error) = 0;
+    virtual void MouseWheel(const int delta, Error** error) = 0;
     /// move mouse to position: cur_point + offset
     virtual void MouseMove(const int x_offset, const int y_offset, Error** error) = 0;
     /// Move the mouse by an offset of the specificed element
diff --git a/src/webdriver/commands/mouse_commands.cc b/src/webdriver/commands/mouse_commands.cc
@@ -256,4 +256,43 @@ void DoubleClickCommand::ExecutePost(Response* const response) {
     }
 }
 
+WheelCommand::WheelCommand(
+    const std::vector<std::string> &path_segments,
+    const base::DictionaryValue * const parameters)
+    : AdvancedMouseCommand(path_segments, parameters) {}
+
+WheelCommand::~WheelCommand() {}
+
+bool WheelCommand::Init(Response* const response) {
+    if (!AdvancedMouseCommand::Init(response))
+        return false;
+
+    if (!GetIntegerParameter("ticks", &ticks_)) {
+        response->SetError(new Error(kBadRequest, "Missing ticks argument"));
+        return false;
+    }
+
+    return true;
+}
+
+void WheelCommand::ExecutePost(Response * const response) {
+    Error* error = NULL;
+
+    // Most mouse types work in steps of 15 degrees,
+    // in which case the delta value is a multiple of 15 * 8 = 120;
+    const int STEP_WHEEL = 120;
+    int delta = ticks_ * STEP_WHEEL;
+
+    session_->RunSessionTask(base::Bind(
+            &ViewCmdExecutor::MouseWheel,
+            base::Unretained(executor_.get()),
+            delta,
+            &error));
+
+    if (error) {
+        response->SetError(error);
+        return;
+    }
+}
+
 }  // namespace webdriver
diff --git a/src/webdriver/extension_qt/graphics_web_view_executor.cc b/src/webdriver/extension_qt/graphics_web_view_executor.cc
@@ -351,6 +351,16 @@ void GraphicsWebViewCmdExecutor::MouseClick(MouseButton button, Error** error) {
     QApplication::postEvent(view_->page(), releaseEvent);
 }
 
+void GraphicsWebViewCmdExecutor::MouseWheel(const int delta, Error** error) {
+    CHECK_VIEW_EXISTANCE
+
+    QPoint point = QCommonUtil::ConvertPointToQPoint(session_->get_mouse_position());
+
+    QWheelEvent *wheelEvent = new QWheelEvent(point, delta, Qt::NoButton, Qt::NoModifier);
+
+    QApplication::postEvent(view_->page(), wheelEvent);
+}
+
 void GraphicsWebViewCmdExecutor::MouseMove(const int x_offset, const int y_offset, Error** error) {
     CHECK_VIEW_EXISTANCE
 
diff --git a/src/webdriver/extension_qt/qml_view_executor.cc b/src/webdriver/extension_qt/qml_view_executor.cc
@@ -304,6 +304,27 @@ void QQmlViewCmdExecutor::MouseClick(MouseButton button, Error** error) {
     QApplication::postEvent(view->viewport(), releaseEvent);
 }
 
+void QQmlViewCmdExecutor::MouseWheel(const int delta, Error **error) {
+    QDeclarativeView* view = getView(view_id_, error);
+    if (NULL == view)
+        return;
+
+    QPoint point = QCommonUtil::ConvertPointToQPoint(session_->get_mouse_position());
+    QPointF scenePoint(point.x(), point.y());
+    QPoint viewPos = view->mapFromScene(scenePoint);
+
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel,  scene: (%4d, %4d)", (int)scenePoint.x(), (int)scenePoint.y()));
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel,   view: (%4d, %4d)", viewPos.x(), viewPos.y()));
+
+    QPoint screenPos = view->mapToGlobal(viewPos);
+
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel, screen: (%4d, %4d)", screenPos.x(), screenPos.y()));
+
+    QWheelEvent *wheelEvent = new QWheelEvent(viewPos, screenPos, delta, Qt::NoButton, Qt::NoModifier);
+
+    QApplication::postEvent(view->viewport(), wheelEvent);
+}
+
 void QQmlViewCmdExecutor::MouseMove(const int x_offset, const int y_offset, Error** error) {
 	QDeclarativeView* view = getView(view_id_, error);
     if (NULL == view)
diff --git a/src/webdriver/extension_qt/quick2_view_executor.cc b/src/webdriver/extension_qt/quick2_view_executor.cc
@@ -321,6 +321,35 @@ void Quick2ViewCmdExecutor::MouseClick(MouseButton button, Error** error) {
     QGuiApplication::postEvent(view, releaseEvent);
 }
 
+void Quick2ViewCmdExecutor::MouseWheel(const int delta, Error **error) {
+    QQuickView* view = getView(view_id_, error);
+    if (NULL == view)
+        return;
+
+    QPoint point = ConvertPointToQPoint(session_->get_mouse_position());
+    QPointF scenePoint(point.x(), point.y());
+    QPointF screenPos(view->x() + scenePoint.x(), view->y() + scenePoint.y());
+
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel,  scene: (%4d, %4d)", (int)scenePoint.x(), (int)scenePoint.y()));
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel, screen: (%4d, %4d)", (int)screenPos.x(), (int)screenPos.y()));
+
+    // ignore scrolling distance in pixels on screen,
+    QPoint pixelDelta(0, 0);
+
+    QPoint angleDelta(0, delta);
+
+    QWheelEvent *wheelEvent = new QWheelEvent(scenePoint,
+                                              screenPos,
+                                              pixelDelta,
+                                              angleDelta,
+                                              delta,
+                                              Qt::Vertical,
+                                              Qt::NoButton,
+                                              Qt::NoModifier);
+
+    QGuiApplication::postEvent(view, wheelEvent);
+}
+
 void Quick2ViewCmdExecutor::MouseMove(const int x_offset, const int y_offset, Error** error) {
 	QQuickView* view = getView(view_id_, error);
     if (NULL == view)
diff --git a/src/webdriver/extension_qt/web_view_executor.cc b/src/webdriver/extension_qt/web_view_executor.cc
@@ -311,6 +311,20 @@ void QWebViewCmdExecutor::MouseClick(MouseButton button, Error** error) {
     }
 }
 
+void QWebViewCmdExecutor::MouseWheel(const int delta, Error **error) {
+    CHECK_VIEW_EXISTANCE
+
+    QPoint point = QCommonUtil::ConvertPointToQPoint(session_->get_mouse_position());
+    QPoint globalPos = view_->mapToGlobal(point);
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel start from : (%4d, %4d) on view", point.x(), point.y()));
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel, screen: (%4d, %4d)", globalPos.x(), globalPos.y()));
+
+
+    QWheelEvent *wheelEvent = new QWheelEvent(point, globalPos, delta, Qt::NoButton, Qt::NoModifier);
+
+    QApplication::postEvent(view_, wheelEvent);
+}
+
 void QWebViewCmdExecutor::MouseMove(const int x_offset, const int y_offset, Error** error) {
     CHECK_VIEW_EXISTANCE
 
diff --git a/src/webdriver/extension_qt/widget_view_executor.cc b/src/webdriver/extension_qt/widget_view_executor.cc
@@ -334,6 +334,32 @@ void QWidgetViewCmdExecutor::MouseClick(MouseButton button, Error** error) {
     }
 }
 
+void QWidgetViewCmdExecutor::MouseWheel(const int delta, Error **error){
+    QWidget* view = getView(view_id_, error);
+    if (NULL == view)
+        return;
+
+    QPoint point = QCommonUtil::ConvertPointToQPoint(session_->get_mouse_position());
+
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel start from : (%4d, %4d) on view", point.x(), point.y()));
+
+    // Find child widget that will receive event
+    QWidget *receiverWidget = view->childAt(point);
+    if (NULL != receiverWidget) {
+        point = receiverWidget->mapFrom(view, point);
+        session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel, rel: (%4d, %4d)", point.x(), point.y()));
+    } else {
+        receiverWidget = view;
+    }
+
+    QPoint globalPos = receiverWidget->mapToGlobal(point);
+    session_->logger().Log(kFineLogLevel, base::StringPrintf("MouseWheel, screen: (%4d, %4d)", globalPos.x(), globalPos.y()));
+
+    QWheelEvent *wheelEvent = new QWheelEvent(point, globalPos, delta, Qt::NoButton, Qt::NoModifier);
+
+    QApplication::postEvent(receiverWidget, wheelEvent);
+}
+
 void QWidgetViewCmdExecutor::MouseMove(const int x_offset, const int y_offset, Error** error) {
 	QWidget* view = getView(view_id_, error);
     if (NULL == view)
diff --git a/src/webdriver/webdriver_route_patterns.cc b/src/webdriver/webdriver_route_patterns.cc
@@ -36,6 +36,7 @@ bool CommandRoutes::IsStandardRoute(const std::string& pattern) {
 		standardCommandRoutes.insert(kMouseButtonDown);
 		standardCommandRoutes.insert(kMouseButtonUp);
 		standardCommandRoutes.insert(kMouseMoveTo);
+		standardCommandRoutes.insert(kMouseWheel);
 		standardCommandRoutes.insert(kFindElement);
 		standardCommandRoutes.insert(kFindElements);
 		standardCommandRoutes.insert(kClearElement);
@@ -126,6 +127,7 @@ const char CommandRoutes::kMouseDoubleClick[] 			= "/session/*/doubleclick";
 const char CommandRoutes::kMouseButtonDown[]			= "/session/*/buttondown";
 const char CommandRoutes::kMouseButtonUp[] 				= "/session/*/buttonup";
 const char CommandRoutes::kMouseMoveTo[] 				= "/session/*/moveto";
+const char CommandRoutes::kMouseWheel[] 				= "/session/*/wheel";
 const char CommandRoutes::kFindElement[] 				= "/session/*/element";
 const char CommandRoutes::kFindElements[] 				= "/session/*/elements";
 const char CommandRoutes::kClearElement[] 				= "/session/*/element/*/clear";
diff --git a/src/webdriver/webdriver_route_table.cc b/src/webdriver/webdriver_route_table.cc
@@ -260,6 +260,7 @@ DefaultRouteTable::DefaultRouteTable()
     Add<ButtonDownCommand>              (CommandRoutes::kMouseButtonDown);
     Add<ButtonUpCommand>                (CommandRoutes::kMouseButtonUp);
     Add<MoveToCommand>                  (CommandRoutes::kMouseMoveTo);
+    Add<WheelCommand>                   (CommandRoutes::kMouseWheel);
     Add<ElementClearCommand>            (CommandRoutes::kClearElement);
     Add<ElementValueCommand>            (CommandRoutes::kSendKeysToElement);
     Add<ElementSubmitCommand>           (CommandRoutes::kSubmitElement);
