Log Message
[Qt][WK2] Fix bounce-back animation on pinch->pan https://bugs.webkit.org/show_bug.cgi?id=87266
Reviewed by Kenneth Rohde Christiansen. If ending an out-of-bounds pinch gesture with releasing one finger (transition to a pan gesture) the bounce back animation blinks in the end position immediately first, then animates the content back into bounds. QtViewportInteractionEngine::cancelScrollAnimation should return early if there is no active kinetic animation. * UIProcess/qt/QtViewportInteractionEngine.cpp: (WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (118340 => 118341)
--- trunk/Source/WebKit2/ChangeLog 2012-05-24 10:01:13 UTC (rev 118340)
+++ trunk/Source/WebKit2/ChangeLog 2012-05-24 10:15:36 UTC (rev 118341)
@@ -1,3 +1,21 @@
+2012-05-24 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Fix bounce-back animation on pinch->pan
+ https://bugs.webkit.org/show_bug.cgi?id=87266
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ If ending an out-of-bounds pinch gesture with releasing one finger
+ (transition to a pan gesture) the bounce back animation blinks in
+ the end position immediately first, then animates the content back
+ into bounds.
+
+ QtViewportInteractionEngine::cancelScrollAnimation should return
+ early if there is no active kinetic animation.
+
+ * UIProcess/qt/QtViewportInteractionEngine.cpp:
+ (WebKit::QtViewportInteractionEngine::cancelScrollAnimation):
+
2012-05-23 Ojan Vafai <[email protected]>
add back the ability to disable flexbox
Modified: trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp (118340 => 118341)
--- trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-05-24 10:01:13 UTC (rev 118340)
+++ trunk/Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp 2012-05-24 10:15:36 UTC (rev 118341)
@@ -533,6 +533,9 @@
void QtViewportInteractionEngine::cancelScrollAnimation()
{
+ if (!scrollAnimationActive())
+ return;
+
// If the pan gesture recognizer receives a touch begin event
// during an ongoing kinetic scroll animation of a previous
// pan gesture, the animation is stopped and the content is
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
