Changeset 124625 in webkit

Timestamp:

Aug 3, 2012 10:21:17 AM (12 years ago)

Author:

Hugo Parente Lima

Message:

[Qt][WK2] There's no way to test the gesture tap on WTR
​https://bugs.webkit.org/show_bug.cgi?id=92895

Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Add an instance of QtViewportHandler to QQuickWebViewPrivate, so it's
now available on mobile and desktop modes, as a side effect gesture tap
events can now be created and sent to WebCore.

This is needed to test tap gestures and to get tap gestures working
when you have a WebView (in desktop mode) on notebooks equipped with
touch screens.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::onComponentComplete):
(QQuickWebViewFlickablePrivate::onComponentComplete): Implementation
moved to QQuickWebViewPrivate::onComponentComplete.

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate):

Tools:

WTR doesn't create the QQuickItem from C++, not from QML, so a call
to componentComplete() was added to mimic the QML behaviour.

• WebKitTestRunner/qt/PlatformWebViewQt.cpp:

(WTR::PlatformWebView::PlatformWebView):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-08-03  Hugo Parente Lima  <hugo.lima@openbossa.org>
+
+        [Qt][WK2] There's no way to test the gesture tap on WTR
+        https://bugs.webkit.org/show_bug.cgi?id=92895
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add an instance of QtViewportHandler to QQuickWebViewPrivate, so it's
+        now available on mobile and desktop modes, as a side effect gesture tap
+        events can now be created and sent to WebCore.
+
+        This is needed to test tap gestures and to get tap gestures working
+        when you have a WebView (in desktop mode) on notebooks equipped with
+        touch screens.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::onComponentComplete):
+        (QQuickWebViewFlickablePrivate::onComponentComplete): Implementation
+        moved to QQuickWebViewPrivate::onComponentComplete.
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate):
+        (QQuickWebViewFlickablePrivate):
+
 2012-08-02  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -322 +322 @@
 }
 
+void QQuickWebViewPrivate::onComponentComplete()
+{
+    Q_Q(QQuickWebView);
+    m_viewportHandler.reset(new QtViewportHandler(webPageProxy.get(), q, pageView.data()));
+    pageView->eventHandler()->setViewportHandler(m_viewportHandler.data());
+}
+
 void QQuickWebViewPrivate::setTransparentBackground(bool enable)
 {
@@ -853 +860 @@
 void QQuickWebViewFlickablePrivate::onComponentComplete()
 {
-    Q_Q(QQuickWebView);
-
-    m_viewportHandler.reset(new QtViewportHandler(webPageProxy.get(), q, pageView.data()));
-    pageView->eventHandler()->setViewportHandler(m_viewportHandler.data());
+    QQuickWebViewPrivate::onComponentComplete();
 
     // Trigger setting of correct visibility flags after everything was allocated and initialized.

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -70 +70 @@
     virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
 
-    virtual void onComponentComplete() { }
+    virtual void onComponentComplete();
 
     virtual void enableMouseEvents() { }
@@ -176 +176 @@
     QQuickWebView* q_ptr;
 
+    QScopedPointer<WebKit::QtViewportHandler> m_viewportHandler;
     FlickableAxisLocker axisLocker;
 
@@ -231 +232 @@
     virtual void didChangeContentsSize(const QSize& newSize);
     virtual void handleMouseEvent(QMouseEvent*);
-
-private:
-    QScopedPointer<WebKit::QtViewportHandler> m_viewportHandler;
 };
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-03  Hugo Parente Lima  <hugo.lima@openbossa.org>
+
+        [Qt][WK2] There's no way to test the gesture tap on WTR
+        https://bugs.webkit.org/show_bug.cgi?id=92895
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        WTR doesn't create the QQuickItem from C++, not from QML, so a call
+        to componentComplete() was added to mimic the QML behaviour.
+
+        * WebKitTestRunner/qt/PlatformWebViewQt.cpp:
+        (WTR::PlatformWebView::PlatformWebView):
+
 2012-08-03  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp

@@ -78 +78 @@
     experimental.setRenderToOffscreenBuffer(true);
     m_view->setAllowAnyHTTPSCertificateForLocalHost(true);
+    m_view->componentComplete();
 }