Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

1 files changed, 8 insertions, 7 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp
index a10367a40..7fa58014f 100644
--- a/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp
@@ -48,7 +48,6 @@ QtPinchGestureRecognizer::QtPinchGestureRecognizer(QtWebPageEventHandler* eventH
 
 bool QtPinchGestureRecognizer::update(const QTouchEvent::TouchPoint& point1, const QTouchEvent::TouchPoint& point2)
 {
-    ASSERT(viewportController());
     const qreal currentFingerDistance = QLineF(point1.screenPos(), point2.screenPos()).length();
     switch (m_state) {
     case NoGesture:
@@ -60,7 +59,8 @@ bool QtPinchGestureRecognizer::update(const QTouchEvent::TouchPoint& point1, con
         if (pinchDistance < pinchInitialTriggerDistanceThreshold)
             return false;
         m_state = GestureRecognized;
-        viewportController()->pinchGestureStarted(computePinchCenter(point1, point2));
+        if (viewportController())
+            viewportController()->pinchGestureStarted(computePinchCenter(point1, point2));
 
         // We reset the initial span distance to the current distance of the
         // touch points in order to avoid the jump caused by the events which
@@ -72,7 +72,8 @@ bool QtPinchGestureRecognizer::update(const QTouchEvent::TouchPoint& point1, con
     case GestureRecognized:
         const qreal totalScaleFactor = currentFingerDistance / m_initialFingerDistance;
         const QPointF touchCenterInViewCoordinates = computePinchCenter(point1, point2);
-        viewportController()->pinchGestureRequestUpdate(touchCenterInViewCoordinates, totalScaleFactor);
+        if (viewportController())
+            viewportController()->pinchGestureRequestUpdate(touchCenterInViewCoordinates, totalScaleFactor);
         return true;
         break;
     }
@@ -86,8 +87,8 @@ void QtPinchGestureRecognizer::finish()
     if (m_state == NoGesture)
         return;
 
-    ASSERT(viewportController());
-    viewportController()->pinchGestureEnded();
+    if (viewportController())
+        viewportController()->pinchGestureEnded();
     reset();
 }
 
@@ -96,8 +97,8 @@ void QtPinchGestureRecognizer::cancel()
     if (m_state == NoGesture)
         return;
 
-    ASSERT(viewportController());
-    viewportController()->pinchGestureCancelled();
+    if (viewportController())
+        viewportController()->pinchGestureCancelled();
     reset();
 }