Title: [102168] trunk/Source/WebKit2
- Revision
- 102168
- Author
- commit-qu...@webkit.org
- Date
- 2011-12-06 12:47:31 -0800 (Tue, 06 Dec 2011)
Log Message
[Qt] Fix assertion in QtViewportInteractionEngine.cpp:468
https://bugs.webkit.org/show_bug.cgi?id=73914
Patch by Alexander Færøy <alexander.fae...@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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102167 => 102168)
--- trunk/Source/WebKit2/ChangeLog 2011-12-06 20:46:07 UTC (rev 102167)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-06 20:47:31 UTC (rev 102168)
@@ -1,3 +1,15 @@
+2011-12-06 Alexander Færøy <alexander.fae...@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.fra...@apple.com>
UI process crashes if the Web Process crashes on launch
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (102167 => 102168)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-12-06 20:46:07 UTC (rev 102167)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2011-12-06 20:47:31 UTC (rev 102168)
@@ -508,7 +508,7 @@
void QtViewportInteractionEngine::pinchGestureStarted(const QPointF& pinchCenterInContentCoordinates)
{
- ASSERT(m_suspendCount);
+ ASSERT(!m_suspendCount);
if (!m_constraints.isUserScalable)
return;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
