[Qt][WK2] Change WebKitTestRunner to use QMouseEvents instead of QGraphicsSceneMouseE...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Sep 2011 14:54:02 +0000 (14:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 30 Sep 2011 14:54:02 +0000 (14:54 +0000)
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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96402 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/EventSenderProxy.h
Tools/WebKitTestRunner/qt/EventSenderProxyQt.cpp

index 51c0e0b..1b9c699 100644 (file)
@@ -1,3 +1,23 @@
+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>
 
         [chromium] Add WebKit API for sending input events to the compositor thread
index 857ad4a..d4eb9c8 100644 (file)
@@ -51,7 +51,6 @@ private:
 #if PLATFORM(QT)
     void sendOrQueueEvent(QEvent*);
     void replaySavedEvents();
-    QGraphicsSceneMouseEvent* createGraphicsSceneMouseEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, Qt::MouseButton, Qt::MouseButtons, Qt::KeyboardModifiers);
 #endif
 
     double m_time;
index 09d40c6..f897b61 100644 (file)
@@ -255,19 +255,6 @@ void EventSenderProxy::updateClickCountForButton(int button)
     m_clickButton = button;
 }
 
-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)
 {
     Qt::KeyboardModifiers modifiers = getModifiers(wkModifiers);
@@ -278,7 +265,7 @@ void EventSenderProxy::mouseDown(unsigned button, WKEventModifiers wkModifiers)
     m_mouseButtons |= mouseButton;
 
     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);
 
     sendOrQueueEvent(event);
@@ -290,7 +277,7 @@ void EventSenderProxy::mouseUp(unsigned button, WKEventModifiers)
     m_mouseButtons &= ~mouseButton;
 
     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);
 
     sendOrQueueEvent(event);
@@ -302,7 +289,7 @@ void EventSenderProxy::mouseMoveTo(double x, double y)
     m_position.y = y;
 
     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);
 
     sendOrQueueEvent(event);