Changeset 52816 in webkit

Timestamp:

Jan 5, 2010 11:44:02 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-05 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Reimplement EventSender::leapForward
​https://bugs.webkit.org/show_bug.cgi?id=33114

Follow Windows implementation of leapForward. When leapForward is called,
messages are queued and posted after the timeout. A new event loop is created to
handle those messages and the additional messages that are created as a result.

• DumpRenderTree/qt/DumpRenderTree.pro:
• DumpRenderTree/qt/EventSenderQt.cpp: (EventSender::EventSender): (EventSender::mouseDown): (EventSender::mouseUp): (EventSender::mouseMoveTo): (EventSender::leapForward): (EventSender::sendOrQueueEvent): (EventSender::replaySavedEvents): (EventSender::eventFilter):
• DumpRenderTree/qt/EventSenderQt.h:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-05  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Reimplement EventSender::leapForward
+        https://bugs.webkit.org/show_bug.cgi?id=33114
+
+        Follow Windows implementation of leapForward. When leapForward is called, 
+        messages are queued and posted after the timeout. A new event loop is created to
+        handle those messages and the additional messages that are created as a result.
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::EventSender):
+        (EventSender::mouseDown):
+        (EventSender::mouseUp):
+        (EventSender::mouseMoveTo):
+        (EventSender::leapForward):
+        (EventSender::sendOrQueueEvent):
+        (EventSender::replaySavedEvents):
+        (EventSender::eventFilter):
+        * DumpRenderTree/qt/EventSenderQt.h:
+
 2010-01-05  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro

@@ -21 +21 @@
 PKGCONFIG += fontconfig
 
-QT = core gui network
+QT = core gui network testlib
 macx: QT += xml
 

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp

@@ -32 +32 @@
 //#include <QtDebug>
 
+#include <QtTest/QtTest>
+
 #define KEYCODE_DEL         127
 #define KEYCODE_BACKSPACE   8
@@ -39 +41 @@
 #define KEYCODE_DOWNARROW   0xf701
 
+#define DRT_MESSAGE_DONE (QEvent::User + 1)
+
+struct DRTEventQueue {
+    QEvent* m_event;
+    int m_delay;
+};
+
+static DRTEventQueue eventQueue[1024];
+static unsigned endOfQueue;
+static unsigned startOfQueue;
 
 EventSender::EventSender(QWebPage* parent)
@@ -44 +56 @@
 {
     m_page = parent;
+    m_mouseButtonPressed = false;
+    m_drag = false;
+    memset(eventQueue, 0, sizeof(eventQueue));
+    endOfQueue = 0;
+    startOfQueue = 0;
+    m_eventLoop = 0;
+    m_page->view()->installEventFilter(this);
 }
 
@@ -71 +90 @@
 
 //     qDebug() << "EventSender::mouseDown" << frame;
-    QMouseEvent event(QEvent::MouseButtonPress, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
-    QApplication::sendEvent(m_page, &event);
+    QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonPress, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
+    sendOrQueueEvent(event);
 }
 
@@ -100 +119 @@
 
 //     qDebug() << "EventSender::mouseUp" << frame;
-    QMouseEvent event(QEvent::MouseButtonRelease, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
-    QApplication::sendEvent(m_page, &event);
+    QMouseEvent* event = new QMouseEvent(QEvent::MouseButtonRelease, m_mousePos, m_mousePos, mouseButton, m_mouseButtons, Qt::NoModifier);
+    sendOrQueueEvent(event);
 }
 
@@ -108 +127 @@
 //     qDebug() << "EventSender::mouseMoveTo" << x << y;
     m_mousePos = QPoint(x, y);
-    QMouseEvent event(QEvent::MouseMove, m_mousePos, m_mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);
-    QApplication::sendEvent(m_page, &event);
+    QMouseEvent* event = new QMouseEvent(QEvent::MouseMove, m_mousePos, m_mousePos, Qt::NoButton, m_mouseButtons, Qt::NoModifier);
+    sendOrQueueEvent(event);
 }
 
 void EventSender::leapForward(int ms)
 {
-    m_timeLeap += ms;
+    eventQueue[endOfQueue].m_delay = ms;
     //qDebug() << "EventSender::leapForward" << ms;
 }
@@ -376 +395 @@
     return 0;
 }
+
+void EventSender::sendOrQueueEvent(QEvent* event)
+{
+    // Mouse move events are queued if 
+    // 1. A previous event was queued.
+    // 2. A delay was set-up by leapForward().
+    // 3. A call to mouseMoveTo while the mouse button is pressed could initiate a drag operation, and that does not return until mouseUp is processed. 
+    // To be safe and avoid a deadlock, this event is queued.
+    if (endOfQueue == startOfQueue && !eventQueue[endOfQueue].m_delay && (!(m_mouseButtonPressed && (m_eventLoop && event->type() == QEvent::MouseButtonRelease)))) {
+        QApplication::sendEvent(m_page->view(), event);
+        delete event;
+        return;
+    }
+    eventQueue[endOfQueue++].m_event = event;
+    eventQueue[endOfQueue].m_delay = 0;
+    replaySavedEvents(event->type() != QEvent::MouseMove);
+}
+
+void EventSender::replaySavedEvents(bool flush)
+{
+    if (startOfQueue < endOfQueue) {
+        // First send all the events that are ready to be sent
+        while (!eventQueue[startOfQueue].m_delay && startOfQueue < endOfQueue) {
+            QEvent* ev = eventQueue[startOfQueue++].m_event;
+            QApplication::postEvent(m_page->view(), ev); // ev deleted by the system
+        }
+        if (startOfQueue == endOfQueue) {
+            // Reset the queue
+            startOfQueue = 0;
+            endOfQueue = 0;
+        } else {
+            QTest::qWait(eventQueue[startOfQueue].m_delay);
+            eventQueue[startOfQueue].m_delay = 0;
+        }
+    }
+    if (!flush)
+        return;
+
+    // Send a marker event, it will tell us when it is safe to exit the new event loop
+    QEvent* drtEvent = new QEvent((QEvent::Type)DRT_MESSAGE_DONE);
+    QApplication::postEvent(m_page->view(), drtEvent);
+
+    // Start an event loop for async handling of Drag & Drop
+    m_eventLoop = new QEventLoop;
+    m_eventLoop->exec();
+    delete m_eventLoop;
+    m_eventLoop = 0;
+}
+
+bool EventSender::eventFilter(QObject* watched, QEvent* event)
+{
+    if (watched != m_page->view())
+        return false;
+    switch (event->type()) {
+    case QEvent::Leave:
+        return true;
+    case QEvent::MouseButtonPress:
+        m_mouseButtonPressed = true;
+        break;
+    case QEvent::MouseMove:
+        if (m_mouseButtonPressed)
+            m_drag = true;
+        break;
+    case QEvent::MouseButtonRelease:
+        m_mouseButtonPressed = false;
+        m_drag = false;
+        break;
+    case DRT_MESSAGE_DONE:
+        m_eventLoop->exit();
+        return true;
+    }
+    return false;
+}

trunk/WebKitTools/DumpRenderTree/qt/EventSenderQt.h

@@ -32 +32 @@
 #include <QApplication>
 #include <QEvent>
+#include <QEventLoop>
 #include <QMouseEvent>
 #include <QObject>
@@ -49 +50 @@
 public:
     EventSender(QWebPage* parent);
+    virtual bool eventFilter(QObject* watched, QEvent* event);
 
 public slots:
@@ -70 +72 @@
 private:
     void sendTouchEvent(QEvent::Type);
+    void sendOrQueueEvent(QEvent*);
+    void replaySavedEvents(bool flush);
     QPoint m_mousePos;
     Qt::MouseButtons m_mouseButtons;
     QWebPage* m_page;
     int m_timeLeap;
+    bool m_mouseButtonPressed;
+    bool m_drag;
+    QEventLoop* m_eventLoop;
     QWebFrame* frameUnderMouse() const;
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)