Changeset 96402 in webkit

Timestamp:

Sep 30, 2011 7:54:02 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents
​https://bugs.webkit.org/show_bug.cgi?id=69145

This is a follow up to ​https://bugs.webkit.org/show_bug.cgi?id=69105
Due to refactorings in Qt5, QMouseEvent now supports floating point coordinates
and is perfectly suitable for SceneGraph as well. GraphicsScene events
will not be available in QtGui anymore in future. Therefore we also have to change
QtWebKit to use QMouseEvents instead of QGraphicsSceneMouseEvents.

Patch by Zeno Albisser <​zeno.albisser@nokia.com> on 2011-09-30
Reviewed by Chang Shu.

• WebKitTestRunner/EventSenderProxy.h:
• WebKitTestRunner/qt/EventSenderProxyQt.cpp:

(WTR::EventSenderProxy::createMouseEvent):
(WTR::EventSenderProxy::mouseDown):
(WTR::EventSenderProxy::mouseUp):
(WTR::EventSenderProxy::mouseMoveTo):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/EventSenderProxy.h (modified) (1 diff)
• WebKitTestRunner/qt/EventSenderProxyQt.cpp (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-30  Zeno Albisser  <zeno.albisser@nokia.com>
+
+        [Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseEvents
+        https://bugs.webkit.org/show_bug.cgi?id=69145
+
+        This is a follow up to https://bugs.webkit.org/show_bug.cgi?id=69105
+        Due to refactorings in Qt5, QMouseEvent now supports floating point coordinates
+        and is perfectly suitable for SceneGraph as well. GraphicsScene events
+        will not be available in QtGui anymore in future. Therefore we also have to change
+        QtWebKit to use QMouseEvents instead of QGraphicsSceneMouseEvents.
+
+        Reviewed by Chang Shu.
+
+        * WebKitTestRunner/EventSenderProxy.h:
+        * WebKitTestRunner/qt/EventSenderProxyQt.cpp:
+        (WTR::EventSenderProxy::createMouseEvent):
+        (WTR::EventSenderProxy::mouseDown):
+        (WTR::EventSenderProxy::mouseUp):
+        (WTR::EventSenderProxy::mouseMoveTo):
+
 2011-09-30  James Robinson  <jamesr@chromium.org>
 

trunk/Tools/WebKitTestRunner/EventSenderProxy.h

@@ -52 +52 @@
     void sendOrQueueEvent(QEvent*);
     void replaySavedEvents();
-    QGraphicsSceneMouseEvent* createGraphicsSceneMouseEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers);
 #endif
 

trunk/Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp

@@ -256 +256 @@
 }
 
-QGraphicsSceneMouseEvent* EventSenderProxy::createGraphicsSceneMouseEvent(QEvent::Type type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
-{
-    QGraphicsSceneMouseEvent* event;
-    event = new QGraphicsSceneMouseEvent(type);
-    event->setPos(pos);
-    event->setScreenPos(screenPos);
-    event->setButton(button);
-    event->setButtons(buttons);
-    event->setModifiers(modifiers);
-
-    return event;
-}
-
 void EventSenderProxy::mouseDown(unsigned button, WKEventModifiers wkModifiers)
 {
@@ -279 +266 @@
 
     QPoint mousePos(m_position.x, m_position.y);
-    QGraphicsSceneMouseEvent* event = createGraphicsSceneMouseEvent((m_clickCount == 2) ? QEvent::GraphicsSceneMouseDoubleClick : QEvent::GraphicsSceneMousePress,
+    QMouseEvent* event = new QMouseEvent((m_clickCount == 2) ? QEvent::MouseButtonDblClick : QEvent::MouseButtonPress,
         mousePos, mousePos, mouseButton, m_mouseButtons, modifiers);
 
@@ -291 +278 @@
 
     QPoint mousePos(m_position.x, m_position.y);
-    QGraphicsSceneMouseEvent* event = createGraphicsSceneMouseEvent(QEvent::GraphicsSceneMouseRelease,
+    QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonRelease,
         mousePos, mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
 
@@ -303 +290 @@
 
     QPoint mousePos(m_position.x, m_position.y);
-    QGraphicsSceneMouseEvent* event = createGraphicsSceneMouseEvent(QEvent::GraphicsSceneMouseMove,
+    QMouseEvent* event = new QMouseEvent(QEvent::MouseMove,
         mousePos, mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);