Changeset 62115 in webkit

Timestamp:

Jun 29, 2010 7:03:59 AM (14 years ago)

Author:

diegohcg@webkit.org

Message:

2010-06-29 Diego Gonzalez <​diegohcg@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Deal with postEvent in case of graphics based DRT
​https://bugs.webkit.org/show_bug.cgi?id=41174

QGraphicsScene does not have a postEvent method, so make scene
send the event, in case of graphics based DRT, and delete it after that.

• DumpRenderTree/qt/EventSenderQt.cpp: (EventSender::scheduleAsynchronousClick): (EventSender::replaySavedEvents): (EventSender::postEvent):
• DumpRenderTree/qt/EventSenderQt.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/EventSenderQt.cpp (modified) (3 diffs)
• DumpRenderTree/qt/EventSenderQt.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-06-29  Diego Gonzalez  <diegohcg@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Deal with postEvent in case of graphics based DRT
+        https://bugs.webkit.org/show_bug.cgi?id=41174
+
+        QGraphicsScene does not have a postEvent method, so make scene
+        send the event, in case of graphics based DRT, and delete it after that.
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::scheduleAsynchronousClick):
+        (EventSender::replaySavedEvents):
+        (EventSender::postEvent):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2010-06-29  Diego Gonzalez  <diegohcg@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp

@@ -369 +369 @@
 {
     QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonPress, m_mousePos, Qt::LeftButton, Qt::RightButton, Qt::NoModifier);
-    QApplication::postEvent(m_page, event);
+    postEvent(m_page, event);
     QMouseEvent* event2 = new QMouseEvent(QEvent::MouseButtonRelease, m_mousePos, Qt::LeftButton, Qt::RightButton, Qt::NoModifier);
-    QApplication::postEvent(m_page, event2);
+    postEvent(m_page, event2);
 }
 
@@ -553 +553 @@
         while (!eventQueue[startOfQueue].m_delay && startOfQueue < endOfQueue) {
             QEvent* ev = eventQueue[startOfQueue++].m_event;
-            QApplication::postEvent(m_page->view(), ev); // ev deleted by the system
+            postEvent(m_page->view(), ev);
         }
         if (startOfQueue == endOfQueue) {
@@ -644 +644 @@
         QApplication::sendEvent(receiver, event);
 }
+
+void EventSender::postEvent(QObject* receiver, QEvent* event)
+{
+    // QGraphicsScene does not have a postEvent method, so send the event in this case
+    // and delete it after that.
+    if (WebCore::WebViewGraphicsBased* view = qobject_cast<WebCore::WebViewGraphicsBased*>(receiver)) {
+        view->scene()->sendEvent(view->graphicsView(), event);
+        delete event;
+    } else
+        QApplication::postEvent(receiver, event); // event deleted by the system
+}

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.h

@@ -91 +91 @@
     QGraphicsSceneWheelEvent* createGraphicsSceneWheelEvent(QEvent::Type, const QPoint& pos, const QPoint& screenPos, int delta, Qt::KeyboardModifiers, Qt::Orientation);
     void sendEvent(QObject* receiver, QEvent* event);
+    void postEvent(QObject* receiver, QEvent* event);
 
 private: