Changeset 132052 in webkit

Timestamp:

Oct 22, 2012 2:48:58 AM (12 years ago)

Author:

allan.jensen@digia.com

Message:

[Qt] Basic gesture event handling
​https://bugs.webkit.org/show_bug.cgi?id=66173

Reviewed by Simon Hausmann.

Source/WebKit/qt:

Implement basic handling of QGestureEvent converting and forwarding
Tap and TapAndHold gestures to WebCore.

• Api/qwebpage.cpp:

(QWebPagePrivate::gestureEvent):
(QWebPage::event):

• Api/qwebpage_p.h:

(QWebPagePrivate):

• WebCoreSupport/WebEventConversion.cpp:

(WebKitPlatformGestureEvent):
(WebCore::WebKitPlatformGestureEvent::WebKitPlatformGestureEvent):
(WebCore::convertGesture):

• WebCoreSupport/WebEventConversion.h:

Tools:

Add support for eventSender.gestureLongPress.

• DumpRenderTree/qt/EventSenderQt.cpp:

(EventSender::EventSender):
(EventSender::gestureLongPress):

• DumpRenderTree/qt/EventSenderQt.h:

(EventSender):

LayoutTests:

• platform/qt-5.0-wk2/TestExpectations:
• platform/qt/TestExpectations:
• platform/qt/fast/events/touch/gesture/gesture-click-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk2/TestExpectations (modified) (2 diffs)
• LayoutTests/platform/qt/TestExpectations (modified) (2 diffs)
• LayoutTests/platform/qt/fast/events/touch/gesture/gesture-click-expected.txt (added)
• Source/WebKit/qt/Api/qwebpage.cpp (modified) (4 diffs)
• Source/WebKit/qt/Api/qwebpage_p.h (modified) (2 diffs)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/WebCoreSupport/WebEventConversion.cpp (modified) (4 diffs)
• Source/WebKit/qt/WebCoreSupport/WebEventConversion.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/EventSenderQt.cpp (modified) (2 diffs)
• Tools/DumpRenderTree/qt/EventSenderQt.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-22  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Basic gesture event handling
+        https://bugs.webkit.org/show_bug.cgi?id=66173
+
+        Reviewed by Simon Hausmann.
+
+        * platform/qt-5.0-wk2/TestExpectations:
+        * platform/qt/TestExpectations:
+        * platform/qt/fast/events/touch/gesture/gesture-click-expected.txt: Added.
+
 2012-10-22  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations

@@ -65 +65 @@
 # eventSender.gestureTap
 fast/events/touch/gesture/gesture-click.html
+# eventSender.gestureLongPress
+fast/events/touch/gesture/context-menu-on-long-press.html
+touchadjustment/touch-links-longpress.html
 # eventSender.beginDragWithFiles
 fast/dom/Window/window-postmessage-clone-frames.html
@@ -608 +611 @@
 http/tests/security/cookies/third-party-cookie-blocking.html
 
-[Qt][WK2] http/tests/misc/willCacheResponse-delegate-callback.html fails
+# [Qt][WK2] http/tests/misc/willCacheResponse-delegate-callback.html fails
 webkit.org/b/99148 http/tests/misc/willCacheResponse-delegate-callback.html
 
-[Qt][WK2] REGRESSION(r131057): It made plugins/plugin-document-back-forward.html timeout
+# [Qt][WK2] REGRESSION(r131057): It made plugins/plugin-document-back-forward.html timeout
 webkit.org/b/99152 plugins/plugin-document-back-forward.html
 
-[Qt][WK2] http/tests/navigation/ping-cross-origin-from-https.html fails
+# [Qt][WK2] http/tests/navigation/ping-cross-origin-from-https.html fails
 webkit.org/b/99155 http/tests/navigation/ping-cross-origin-from-https.html
 

trunk/LayoutTests/platform/qt/TestExpectations

@@ -431 +431 @@
 fast/js/names.html
 
-# Don't have GestureLongPress, GestureTapCancel event types
-touchadjustment/touch-links-longpress.html
+# Don't have GestureTapCancel event type
 touchadjustment/touch-links-active.html
 
@@ -1960 +1959 @@
 fast/dom/HTMLMeterElement/meter-appearances-rating-relevancy.html
 fast/dynamic/text-combine.html
-fast/events/touch/gesture/context-menu-on-long-press.html
 fast/events/touch/gesture/context-menu-on-two-finger-tap.html
 fast/images/pixel-crack-image-background-webkit-transform-scale.html

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -95 +95 @@
 #include "PageGroup.h"
 #include "Pasteboard.h"
+#include "PlatformGestureEvent.h"
 #include "PlatformKeyboardEvent.h"
 #include "PlatformTouchEvent.h"
@@ -132 +133 @@
 #include <QDropEvent>
 #include <QFileDialog>
+#include <QGestureEvent>
 #include <QInputDialog>
 #include <QLabel>
@@ -1328 +1330 @@
     // Return whether the default action was cancelled in the JS event handler
     return frame->eventHandler()->handleTouchEvent(convertTouchEvent(event));
+#else
+    event->ignore();
+    return false;
+#endif
+}
+
+bool QWebPagePrivate::gestureEvent(QGestureEvent* event)
+{
+#if ENABLE(GESTURE_EVENTS)
+    WebCore::Frame* frame = QWebFramePrivate::core(mainFrame.data());
+    if (!frame->view())
+        return false;
+
+    // QGestureEvents can contain updates for multiple gestures.
+    bool handled = false;
+    QGesture* gesture = event->gesture(Qt::TapGesture);
+    // Beware that gestures send by DumpRenderTree will have state Qt::NoGesture,
+    // due to not originating from a GestureRecognizer.
+    if (gesture && (gesture->state() == Qt::GestureStarted || gesture->state() == Qt::NoGesture)) {
+        frame->eventHandler()->handleGestureEvent(convertGesture(event, gesture));
+        event->setAccepted(true);
+        handled = true;
+    }
+    gesture = event->gesture(Qt::TapAndHoldGesture);
+    if (gesture && (gesture->state() == Qt::GestureStarted || gesture->state() == Qt::NoGesture)) {
+        frame->eventHandler()->sendContextMenuEventForGesture(convertGesture(event, gesture));
+        event->setAccepted(true);
+        handled = true;
+    }
+
+    return handled;
 #else
     event->ignore();
@@ -3144 +3177 @@
         // Return whether the default action was cancelled in the JS event handler
         return d->touchEvent(static_cast<QTouchEvent*>(ev));
+#ifndef QT_NO_GESTURES
+    case QEvent::Gesture:
+        d->gestureEvent(static_cast<QGestureEvent*>(ev));
+        break;
+#endif
 #ifndef QT_NO_PROPERTIES
     case QEvent::DynamicPropertyChange:

trunk/Source/WebKit/qt/Api/qwebpage_p.h

@@ -27 +27 @@
 #include <qnetworkproxy.h>
 #include <qevent.h>
+#include <qgesture.h>
 #include <qgraphicssceneevent.h>
 
@@ -134 +135 @@
     bool touchEvent(QTouchEvent*);
 
+    bool gestureEvent(QGestureEvent*);
+
     class TouchAdjuster {
     public:

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-10-22  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Basic gesture event handling
+        https://bugs.webkit.org/show_bug.cgi?id=66173
+
+        Reviewed by Simon Hausmann.
+
+        Implement basic handling of QGestureEvent converting and forwarding
+        Tap and TapAndHold gestures to WebCore.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::gestureEvent):
+        (QWebPage::event):
+        * Api/qwebpage_p.h:
+        (QWebPagePrivate):
+        * WebCoreSupport/WebEventConversion.cpp:
+        (WebKitPlatformGestureEvent):
+        (WebCore::WebKitPlatformGestureEvent::WebKitPlatformGestureEvent):
+        (WebCore::convertGesture):
+        * WebCoreSupport/WebEventConversion.h:
+
 2012-10-17  Tor Arne Vestbø  <tor.arne.vestbo@digia.com>
 

trunk/Source/WebKit/qt/WebCoreSupport/WebEventConversion.cpp

@@ -23 +23 @@
 #include "WebEventConversion.h"
 
+#include "PlatformGestureEvent.h"
 #include "PlatformMouseEvent.h"
 #include "PlatformTouchEvent.h"
@@ -28 +29 @@
 #include "PlatformWheelEvent.h"
 #include <QApplication>
+#include <QGesture>
+#include <QGestureEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QTouchEvent>
 #include <QWheelEvent>
+#include <QWidget>
 #include <wtf/CurrentTime.h>
 
@@ -303 +307 @@
 #endif
 
+#if ENABLE(GESTURE_EVENTS)
+class WebKitPlatformGestureEvent : public PlatformGestureEvent {
+public:
+    WebKitPlatformGestureEvent(const QGestureEvent*, const QGesture*);
+};
+
+WebKitPlatformGestureEvent::WebKitPlatformGestureEvent(const QGestureEvent* event, const QGesture* gesture)
+{
+    switch (gesture->gestureType()) {
+    case Qt::TapGesture: {
+        m_type = PlatformEvent::GestureTap;
+        QPointF globalPos = static_cast<const QTapGesture*>(gesture)->position();
+        m_globalPosition = globalPos.toPoint();
+        m_position = event->widget()->mapFromGlobal(globalPos.toPoint());
+        break;
+    }
+    case Qt::TapAndHoldGesture: {
+        m_type = PlatformEvent::GestureLongPress;
+        QPointF globalPos = static_cast<const QTapAndHoldGesture*>(gesture)->position();
+        m_globalPosition = globalPos.toPoint();
+        m_position = event->widget()->mapFromGlobal(globalPos.toPoint());
+        break;
+    }
+    default:
+        ASSERT_NOT_REACHED();
+        break;
+    }
+    m_timestamp = WTF::currentTime();
+}
+
+#endif
+
 PlatformWheelEvent convertWheelEvent(QWheelEvent* event)
 {
@@ -320 +356 @@
 #endif
 
-}
+#if ENABLE(GESTURE_EVENTS)
+PlatformGestureEvent convertGesture(QGestureEvent* event, QGesture* gesture)
+{
+    return WebKitPlatformGestureEvent(event, gesture);
+}
+#endif
+
+}

trunk/Source/WebKit/qt/WebCoreSupport/WebEventConversion.h

@@ -28 +28 @@
 class QGraphicsSceneWheelEvent;
 class QTouchEvent;
+class QGesture;
+class QGestureEvent;
 QT_END_NAMESPACE
 
@@ -34 +36 @@
 class PlatformMouseEvent;
 class PlatformWheelEvent;
-
 
 PlatformMouseEvent convertMouseEvent(QInputEvent*, int clickCount);
@@ -45 +46 @@
 PlatformTouchEvent convertTouchEvent(QTouchEvent*);
 #endif
+
+#if ENABLE(GESTURE_EVENTS)
+class PlatformGestureEvent;
+PlatformGestureEvent convertGesture(QGestureEvent*, QGesture*);
+#endif
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2012-10-22  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] Basic gesture event handling
+        https://bugs.webkit.org/show_bug.cgi?id=66173
+
+        Reviewed by Simon Hausmann.
+
+        Add support for eventSender.gestureLongPress.
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::EventSender):
+        (EventSender::gestureLongPress):
+        * DumpRenderTree/qt/EventSenderQt.h:
+        (EventSender):
+
 2012-10-22  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 

trunk/Tools/DumpRenderTree/qt/EventSenderQt.cpp

@@ -63 +63 @@
 #ifndef QT_NO_GESTURES
     , m_tapGesture(parent)
+    , m_tapAndHoldGesture(parent)
 #endif
 {
@@ -578 +579 @@
     sendEvent(m_page, &event);
 }
+
+void EventSender::gestureLongPress(int x, int y)
+{
+    m_tapAndHoldGesture.setPosition(QPointF(x, y));
+    m_gestures.clear();
+    m_gestures.append(&m_tapAndHoldGesture);
+    QGestureEvent event(m_gestures);
+    sendEvent(m_page, &event);
+}
 #endif
 

trunk/Tools/DumpRenderTree/qt/EventSenderQt.h

@@ -89 +89 @@
 #ifndef QT_NO_GESTURES
     void gestureTap(int x, int y);
+    void gestureLongPress(int x, int y);
 #endif
     void beginDragWithFiles(const QStringList& files);
@@ -124 +125 @@
 #ifndef QT_NO_GESTURES
     QTapGesture m_tapGesture;
+    QTapAndHoldGesture m_tapAndHoldGesture;
     QList<QGesture*> m_gestures;
 #endif