Clear pending events upon main frame navigation

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

 // Copyright 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.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 700 matching lines @@
                 // here. One for which the provisional load is commited will have the strong binding
                 // removed in navigationEntryCommitted() below.
                 if (isProvisionalLoad) determinedProcessVisibility();
             }
 
             @Override
             public void didNavigateMainFrame(String url, String baseUrl,
                     boolean isNavigationToDifferentPage, boolean isFragmentNavigation) {
                 if (!isNavigationToDifferentPage) return;
                 hidePopupsAndClearSelection();
+                if (mNativeContentViewCore != 0) nativeResetPendingInput(mNativeContentViewCore);
                 resetScrollInProgress();
-                resetGestureDetection();
             }
 
             @Override
             public void renderProcessGone(boolean wasOomProtected) {
                 hidePopupsAndClearSelection();
                 resetScrollInProgress();
                 // No need to reset gesture detection as the detector will have
                 // been destroyed in the RenderWidgetHostView.
             }
 
@@ skipping 367 matching lines @@
         // actions have no corresponding WebTouchEvent type and may confuse the
         // touch pipline, so we ignore them entirely.
         return eventAction == MotionEvent.ACTION_DOWN
                 || eventAction == MotionEvent.ACTION_UP
                 || eventAction == MotionEvent.ACTION_CANCEL
                 || eventAction == MotionEvent.ACTION_MOVE
                 || eventAction == MotionEvent.ACTION_POINTER_DOWN
                 || eventAction == MotionEvent.ACTION_POINTER_UP;
     }
 
-    public void setIgnoreRemainingTouchEvents() {
-        resetGestureDetection();
-    }
-
     public boolean isScrollInProgress() {
         return mTouchScrollInProgress || mPotentiallyActiveFlingCount > 0;
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void onFlingStartEventConsumed(int vx, int vy) {
         mTouchScrollInProgress = false;
         mPotentiallyActiveFlingCount++;
         for (mGestureStateListenersIterator.rewind();
@@ skipping 218 matching lines @@
         if (mActionMode != null) {
             mActionMode.finish();
             mActionMode = null;
         }
     }
 
     public boolean isSelectActionBarShowing() {
         return mActionMode != null;
     }
 
-    private void resetGestureDetection() {
-        if (mNativeContentViewCore == 0) return;
-        nativeResetGestureDetection(mNativeContentViewCore);
-    }
-
     /**
      * @see View#onAttachedToWindow()
      */
     @SuppressWarnings("javadoc")
     public void onAttachedToWindow() {
         setAccessibilityState(mAccessibilityManager.isEnabled());
         restoreSelectionPopupsIfNecessary();
         ScreenOrientationListener.getInstance().addObserver(this, mContext);
         GamepadList.onAttachedToWindow(mContext);
     }
@@ skipping 133 matching lines @@
     private void cancelRequestToScrollFocusedEditableNodeIntoView() {
         // Zero-ing the rect will prevent |updateAfterSizeChanged()| from
         // issuing the delayed form focus event.
         mFocusPreOSKViewportRect.setEmpty();
     }
 
     /**
      * @see View#onWindowFocusChanged(boolean)
      */
     public void onWindowFocusChanged(boolean hasWindowFocus) {
-        if (!hasWindowFocus) resetGestureDetection();
+        if (!hasWindowFocus) {
+            if (mNativeContentViewCore == 0) return;
+            nativeCancelActiveTouchSequence(mNativeContentViewCore);
+        }
     }
 
     public void onFocusChanged(boolean gainFocus) {
         if (gainFocus) {
             restoreSelectionPopupsIfNecessary();
         } else {
             hideImeIfNeeded();
             cancelRequestToScrollFocusedEditableNodeIntoView();
             if (mPreserveSelectionOnNextLossOfFocus) {
                 mPreserveSelectionOnNextLossOfFocus = false;
@@ skipping 1472 matching lines @@
     private native void nativePinchBy(long nativeContentViewCoreImpl, long timeMs,
             float anchorX, float anchorY, float deltaScale);
 
     private native void nativeSelectBetweenCoordinates(
             long nativeContentViewCoreImpl, float x1, float y1, float x2, float y2);
 
     private native void nativeMoveCaret(long nativeContentViewCoreImpl, float x, float y);
 
     private native void nativeHideTextHandles(long nativeContentViewCoreImpl);
 
-    private native void nativeResetGestureDetection(long nativeContentViewCoreImpl);
+    private native void nativeCancelActiveTouchSequence(long nativeContentViewCoreImpl);
+
+    private native void nativeResetPendingInput(long nativeContentViewCoreImpl);
 
     private native void nativeSetDoubleTapSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeSetMultiTouchZoomSupportEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeSelectPopupMenuItems(long nativeContentViewCoreImpl,
             long nativeSelectPopupSourceFrame, int[] indices);
 
@@ skipping 14 matching lines @@
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }