Changeset 102168 in webkit

Timestamp:

Dec 6, 2011 12:47:31 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix assertion in QtViewportInteractionEngine.cpp:468
​https://bugs.webkit.org/show_bug.cgi?id=73914

Patch by Alexander Færøy <​alexander.faeroy@nokia.com> on 2011-12-06
Reviewed by Kenneth Rohde Christiansen.

m_suspendCount should always be zero when a pinch gesture is started.

• UIProcess/qt/QtViewportInteractionEngine.cpp:

(WebKit::QtViewportInteractionEngine::pinchGestureStarted):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/QtViewportInteractionEngine.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-06  Alexander Færøy  <alexander.faeroy@nokia.com>
+
+        [Qt] Fix assertion in QtViewportInteractionEngine.cpp:468
+        https://bugs.webkit.org/show_bug.cgi?id=73914
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        m_suspendCount should always be zero when a pinch gesture is started.
+
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        (WebKit::QtViewportInteractionEngine::pinchGestureStarted):
+
 2011-12-06  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -509 +509 @@
 void QtViewportInteractionEngine::pinchGestureStarted(const QPointF& pinchCenterInContentCoordinates)
 {
-    ASSERT(m_suspendCount);
+    ASSERT(!m_suspendCount);
 
     if (!m_constraints.isUserScalable)