Fix Handle above IME issue

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.ContentResolver;
@@ skipping 305 matching lines @@
     // Accessibility touch exploration state.
     private boolean mTouchExplorationEnabled;
 
     // Allows us to dynamically respond when the accessibility script injection flag changes.
     private ContentObserver mAccessibilityScriptInjectionObserver;
 
     // Temporary notification to tell onSizeChanged to focus a form element,
     // because the OSK was just brought up.
     private final Rect mFocusPreOSKViewportRect = new Rect();
 
+    // Whether Keyboard state has been changed (hidden/shown)
+    private boolean mIsKeyboardStateChanged = false;
+
     // On tap this will store the x, y coordinates of the touch.
     private int mLastTapX;
     private int mLastTapY;
 
     // Whether a touch scroll sequence is active, used to hide text selection
     // handles. Note that a scroll sequence will *always* bound a pinch
     // sequence, so this will also be true for the duration of a pinch gesture.
     private boolean mTouchScrollInProgress;
 
     // The outstanding fling start events that hasn't got fling end yet. It may be > 1 because
@@ skipping 230 matching lines @@
                                         resultCode == InputMethodManager.RESULT_SHOWN ||
                                         resultCode == InputMethodManager.RESULT_UNCHANGED_SHOWN);
                                 if (resultCode == InputMethodManager.RESULT_SHOWN) {
                                     // If OSK is newly shown, delay the form focus until
                                     // the onSizeChanged (in order to adjust relative to the
                                     // new size).
                                     // TODO(jdduke): We should not assume that onSizeChanged will
                                     // always be called, crbug.com/294908.
                                     getContainerView().getWindowVisibleDisplayFrame(
                                             mFocusPreOSKViewportRect);
+                                    mIsKeyboardStateChanged = true;
                                 } else if (hasFocus() && resultCode ==
                                         InputMethodManager.RESULT_UNCHANGED_SHOWN) {
                                     // If the OSK was already there, focus the form immediately.
                                     scrollFocusedEditableNodeIntoView();
                                 }
                             }
                         };
                     }
                 }
         );
@@ skipping 535 matching lines @@
     }
 
     // End FrameLayout overrides.
 
     /**
      * @see View#onTouchEvent(MotionEvent)
      */
     public boolean onTouchEvent(MotionEvent event) {
         TraceEvent.begin("onTouchEvent");
         try {
             cancelRequestToScrollFocusedEditableNodeIntoView();

[jdduke (slow), 2014/07/15 15:36:58]

I think we can achieve the same result by simply moving this command below
|final int eventAction = event.getActionMasked();|, and then calling it like:

if (eventAction == MotionEvent.ACTION_DOWN) {
    cancelRequestToScrollFocusedEditableNodeIntoView();
}

While it might result in the scroll after longpress being interrupted by the
focus call, it's somewhat simpler than the additional logic bit.

[AviD, 2014/07/15 15:58:02]

Agree. 
It was my initial thought, but wasn't sure of the side effects it might cause.
Will change to this.

 
             final int eventAction = event.getActionMasked();
 
             // Only these actions have any effect on gesture detection.  Other
             // actions have no corresponding WebTouchEvent type and may confuse the
             // touch pipline, so we ignore them entirely.
             if (eventAction != MotionEvent.ACTION_DOWN
                     && eventAction != MotionEvent.ACTION_UP
                     && eventAction != MotionEvent.ACTION_CANCEL
                     && eventAction != MotionEvent.ACTION_MOVE
@@ skipping 452 matching lines @@
         if (!mFocusPreOSKViewportRect.isEmpty()) {
             Rect rect = new Rect();
             getContainerView().getWindowVisibleDisplayFrame(rect);
             if (!rect.equals(mFocusPreOSKViewportRect)) {
                 // Only assume the OSK triggered the onSizeChanged if width was preserved.
                 if (rect.width() == mFocusPreOSKViewportRect.width()) {
                     scrollFocusedEditableNodeIntoView();
                 }
                 cancelRequestToScrollFocusedEditableNodeIntoView();
             }
+            mIsKeyboardStateChanged = false;
         }
     }
 
     private void cancelRequestToScrollFocusedEditableNodeIntoView() {
+        // Ignore if onTouchEvent triggerred this call after IME state is updated
+        if (mIsKeyboardStateChanged == true) return;
+
         // Zero-ing the rect will prevent |updateAfterSizeChanged()| from
         // issuing the delayed form focus event.
         mFocusPreOSKViewportRect.setEmpty();
     }
 
     private void scrollFocusedEditableNodeIntoView() {
         if (mNativeContentViewCore == 0) return;
         // The native side keeps track of whether the zoom and scroll actually occurred. It is
         // more efficient to do it this way and sometimes fire an unnecessary message rather
         // than synchronize with the renderer and always have an additional message.
@@ skipping 1728 matching lines @@
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 
     private native void nativeResumeResponseDeferredAtStart(
             long nativeContentViewCoreImpl);
     private native void nativeSetHasPendingNavigationTransitionForTesting(
             long nativeContentViewCoreImpl);
 }