[Android] Properly handle cancelled scroll events

content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
@@ skipping 978 matching lines @@
     private boolean processTouchEvent(MotionEvent event) {
         boolean handled = false;
         // The last "finger up" is an end to scrolling but may not be
         // an end to movement (e.g. fling scroll).  We do not tell
         // native code to end scrolling until we are sure we did not
         // fling.
         boolean possiblyEndMovement = false;
         // "Last finger raised" could be an end to movement.  However,
         // give the mSimpleTouchDetector a chance to continue
         // scrolling with a fling.
-        if (event.getAction() == MotionEvent.ACTION_UP) {
+        if (event.getAction() == MotionEvent.ACTION_UP
+                || event.getAction() == MotionEvent.ACTION_CANCEL) {
             if (mTouchScrolling) {
                 possiblyEndMovement = true;
             }
         }
 
         mLongPressDetector.cancelLongPressIfNeeded(event);
         mLongPressDetector.startLongPressTimerIfNeeded(event);
 
         // Use the framework's GestureDetector to detect pans and zooms not already
         // handled by the WebKit touch events gesture manager.
@@ skipping 205 matching lines @@
         assert (mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_DISABLED ||
                 mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_NONE);
         mDoubleTapDragMode = supportDoubleTapDrag ?
                 DOUBLE_TAP_DRAG_MODE_NONE : DOUBLE_TAP_DRAG_MODE_DISABLED;
     }
 
     private boolean isDoubleTapDragDisabled() {
         return mDoubleTapDragMode == DOUBLE_TAP_DRAG_MODE_DISABLED;
     }
 }