Changeset 147909 in webkit

Timestamp:

Apr 8, 2013 4:13:20 AM (11 years ago)

Author:

abecsi@webkit.org

Message:

[Qt][WK2] WebView's interactive property is not fully respected
​https://bugs.webkit.org/show_bug.cgi?id=113066

Reviewed by Jocelyn Turcotte.

WK2 sign-off by Benjamin Poulain.

The QML WebView inherits the "interactive" property from Flickable
which is true by default, and disables the interaction with the
Flickable if set to false.
Resulting from the design of the WebView panning and flicking is
disabled by Flickable but to be consistent we also need to disable
double-tap gestures and pinch gestures since they would trigger
scale and position changes.

• UIProcess/qt/PageViewportControllerClientQt.cpp:

(WebKit::PageViewportControllerClientQt::pinchGestureStarted):
(WebKit::PageViewportControllerClientQt::pinchGestureRequestUpdate):
(WebKit::PageViewportControllerClientQt::pinchGestureEnded):

• UIProcess/qt/QtWebPageEventHandler.cpp:

(WebKit::QtWebPageEventHandler::handleDoubleTapEvent):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/PageViewportControllerClientQt.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebPageEventHandler.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-08  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt][WK2] WebView's interactive property is not fully respected
+        https://bugs.webkit.org/show_bug.cgi?id=113066
+
+        Reviewed by Jocelyn Turcotte.
+
+        WK2 sign-off by Benjamin Poulain.
+
+        The QML WebView inherits the "interactive" property from Flickable
+        which is true by default, and disables the interaction with the
+        Flickable if set to false.
+        Resulting from the design of the WebView panning and flicking is
+        disabled by Flickable but to be consistent we also need to disable
+        double-tap gestures and pinch gestures since they would trigger
+        scale and position changes.
+
+        * UIProcess/qt/PageViewportControllerClientQt.cpp:
+        (WebKit::PageViewportControllerClientQt::pinchGestureStarted):
+        (WebKit::PageViewportControllerClientQt::pinchGestureRequestUpdate):
+        (WebKit::PageViewportControllerClientQt::pinchGestureEnded):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit::QtWebPageEventHandler::handleDoubleTapEvent):
+
 2013-04-07  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp

@@ -431 +431 @@
     ASSERT(m_touchInteraction.inProgress());
 
-    if (!m_controller->allowsUserScaling())
+    if (!m_controller->allowsUserScaling() || !m_viewportItem->isInteractive())
         return;
 
@@ -443 +443 @@
 void PageViewportControllerClientQt::pinchGestureRequestUpdate(const QPointF& pinchCenterInViewportCoordinates, qreal totalScaleFactor)
 {
+    if (!m_controller->allowsUserScaling() || !m_viewportItem->isInteractive())
+        return;
+
     ASSERT(m_scaleChange.inProgress());
-
-    if (!m_controller->allowsUserScaling())
-        return;
-
     ASSERT(m_pinchStartScale > 0);
     //  Changes of the center position should move the page even if the zoom factor does not change.
@@ -465 +464 @@
 void PageViewportControllerClientQt::pinchGestureEnded()
 {
+    if (m_pinchStartScale < 0)
+        return;
+
     ASSERT(m_scaleChange.inProgress());
-
-    if (!m_controller->allowsUserScaling())
-        return;
-
     m_pinchStartScale = -1;
 

trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

@@ -272 +272 @@
 void QtWebPageEventHandler::handleDoubleTapEvent(const QTouchEvent::TouchPoint& point)
 {
+    if (!m_webView->isInteractive())
+        return;
+
     deactivateTapHighlight();
     QTransform fromItemTransform = m_webPage->transformFromItem();