Introduce ThreadedInputConnection behind a switch

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.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 316 matching lines @@
         public void navigationEntryCommitted() {
             determinedProcessVisibility();
         }
 
         private void resetPopupsAndInput() {
             ContentViewCore contentViewCore = mWeakContentViewCore.get();
             if (contentViewCore == null) return;
             contentViewCore.mIsMobileOptimizedHint = false;
             contentViewCore.hidePopupsAndClearSelection();
             contentViewCore.resetScrollInProgress();
+            contentViewCore.resetImeAdapter();

[Ted C, 2016/02/02 23:14:42]

you can just do contentViewCore.mImeAdapter.reset();

Then you don't need this new method (and is consistent across call sites)

[Changwan Ryu, 2016/02/11 16:21:07]

Done.

[Ted C, 2016/02/17 19:09:33]

Looks like this didn't land?

[Changwan Ryu, 2016/02/18 06:03:26]

My bad, it's done now.

         }
 
         private void determinedProcessVisibility() {
             ContentViewCore contentViewCore = mWeakContentViewCore.get();
             if (contentViewCore == null) return;
             // Signal to the process management logic that we can now rely on the process
             // visibility signal for binding management. Before the navigation commits, its
             // renderer is considered background even if the pending navigation happens in the
             // foreground renderer.
             ChildProcessLauncher.determinedVisibility(contentViewCore.getCurrentRenderProcessId());
@@ skipping 580 matching lines @@
      * onDetachedFromWindow() which is guaranteed to be called in Android WebView.
      */
     public void destroy() {
         if (mNativeContentViewCore != 0) {
             nativeOnJavaContentViewCoreDestroyed(mNativeContentViewCore);
         }
         mWebContentsObserver.destroy();
         mWebContentsObserver = null;
         setSmartClipDataListener(null);
         setZoomControlsDelegate(null);
+        mImeAdapter.reset();
         // TODO(igsolla): address TODO in ContentViewClient because ContentViewClient is not
         // currently a real Null Object.
         //
         // Instead of deleting the client we use the Null Object pattern to avoid null checks
         // in this class.
         mContentViewClient = new ContentViewClient();
         mWebContents = null;
         mOverscrollRefreshHandler = null;
         mNativeContentViewCore = 0;
         mJavaScriptInterfaces.clear();
@@ skipping 2134 matching lines @@
     public void setSmartClipDataListener(SmartClipDataListener listener) {
         mSmartClipDataListener = listener;
     }
 
     public void setBackgroundOpaque(boolean opaque) {
         if (mNativeContentViewCore != 0) {
             nativeSetBackgroundOpaque(mNativeContentViewCore, opaque);
         }
     }
 
+    @VisibleForTesting
+    public WebContentsObserver getWebContentsObserverForTest() {
+        return mWebContentsObserver;
+    }
+
     /**
      * Offer a long press gesture to the embedding View, primarily for WebView compatibility.
      *
      * @return true if the embedder handled the event.
      */
     private boolean offerLongPressToEmbedder() {
         return mContainerView.performLongClick();
     }
 
     /**
      * Reset scroll and fling accounting, notifying listeners as appropriate.
      * This is useful as a failsafe when the input stream may have been interruped.
      */
     private void resetScrollInProgress() {
         if (!isScrollInProgress()) return;
 
         final boolean touchScrollInProgress = mTouchScrollInProgress;
         final int potentiallyActiveFlingCount = mPotentiallyActiveFlingCount;
 
         setTouchScrollInProgress(false);
         mPotentiallyActiveFlingCount = 0;
         if (touchScrollInProgress) updateGestureStateListener(GestureEventType.SCROLL_END);
         if (potentiallyActiveFlingCount > 0) updateGestureStateListener(GestureEventType.FLING_END);
     }
 
+    private void resetImeAdapter() {
+        mImeAdapter.reset();
+    }
+
     private float getWheelScrollFactorInPixels() {
         if (mWheelScrollFactorInPixels == 0) {
             TypedValue outValue = new TypedValue();
             // This is the same attribute used by Android Views to scale wheel
             // event motion into scroll deltas.
             if (mContext.getTheme().resolveAttribute(
                         android.R.attr.listPreferredItemHeight, outValue, true)) {
                 mWheelScrollFactorInPixels =
                         outValue.getDimension(mContext.getResources().getDisplayMetrics());
             } else {
@@ skipping 165 matching lines @@
     private native void nativeSetTextTrackSettings(long nativeContentViewCoreImpl,
             boolean textTracksEnabled, String textTrackBackgroundColor, String textTrackFontFamily,
             String textTrackFontStyle, String textTrackFontVariant, String textTrackTextColor,
             String textTrackTextShadow, String textTrackTextSize);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }