[chromium] return true/false on GestureFlingCancel if a fling was stopped

https://bugs.webkit.org/show_bug.cgi?id=81563

Patch by Robert Kroeger <rjkroege@chromium.org> on 2012-03-19
Reviewed by James Robinson.

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::gestureEvent):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111314 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 28ec011f900e6fcf35e65b83f38cef8dab4010f1..f34d27af1a043a5a20f163a54a5860a8314059a0 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-19  Robert Kroeger  <rjkroege@chromium.org>
+
+        [chromium] return true/false on GestureFlingCancel if a fling was stopped
+        https://bugs.webkit.org/show_bug.cgi?id=81563
+
+        Reviewed by James Robinson.
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::gestureEvent):
+
 2012-03-19  Michal Mocny  <mmocny@google.com>
 
         [chromium] Adding support for GL_EXT_discard_framebuffer.

diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
index 4f59c9005e691fd92e6c88abf9eeb835ef0b5703..11aeeba7519d7a1b9a86e827ca7b6cac3ae56f87 100644 (file)
--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
@@ -639,8 +639,11 @@ bool WebViewImpl::gestureEvent(const WebGestureEvent& event)
         return true;
     }
     case WebInputEvent::GestureFlingCancel:
-        m_gestureAnimation.clear();
-        return true;
+        if (m_gestureAnimation) {
+            m_gestureAnimation.clear();
+            return true;
+        }
+        return false;
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate: