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 43 matching lines @@
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content.R;
 import org.chromium.content.browser.ScreenOrientationListener.ScreenOrientationObserver;
 import org.chromium.content.browser.accessibility.BrowserAccessibilityManager;
 import org.chromium.content.browser.accessibility.captioning.CaptioningBridgeFactory;
 import org.chromium.content.browser.accessibility.captioning.SystemCaptioningBridge;
 import org.chromium.content.browser.accessibility.captioning.TextTrackSettings;
 import org.chromium.content.browser.input.AdapterInputConnection;
+import org.chromium.content.browser.input.ChromiumBaseInputConnection;
+import org.chromium.content.browser.input.ChromiumBaseInputConnectionFactory;
 import org.chromium.content.browser.input.FloatingPastePopupMenu;
 import org.chromium.content.browser.input.GamepadList;
 import org.chromium.content.browser.input.ImeAdapter;
-import org.chromium.content.browser.input.ImeAdapter.AdapterInputConnectionFactory;
 import org.chromium.content.browser.input.InputMethodManagerWrapper;
 import org.chromium.content.browser.input.JoystickScrollProvider;
 import org.chromium.content.browser.input.LegacyPastePopupMenu;
 import org.chromium.content.browser.input.PastePopupMenu;
 import org.chromium.content.browser.input.PastePopupMenu.PastePopupMenuDelegate;
 import org.chromium.content.browser.input.SelectPopup;
 import org.chromium.content.browser.input.SelectPopupDialog;
 import org.chromium.content.browser.input.SelectPopupDropdown;
 import org.chromium.content.browser.input.SelectPopupItem;
 import org.chromium.content.common.ContentSwitches;
@@ skipping 402 matching lines @@
     private PopupZoomer mPopupZoomer;
     private SelectPopup mSelectPopup;
     private long mNativeSelectPopupSourceFrame = 0;
 
     private OverscrollRefreshHandler mOverscrollRefreshHandler;
 
     private Runnable mFakeMouseMoveRunnable = null;
 
     // Only valid when focused on a text / password field.
     private ImeAdapter mImeAdapter;
-    private ImeAdapter.AdapterInputConnectionFactory mAdapterInputConnectionFactory;
-    private AdapterInputConnection mInputConnection;
+    private ChromiumBaseInputConnectionFactory mInputConnectionFactory;
+    private ChromiumBaseInputConnection mInputConnection;
     private InputMethodManagerWrapper mInputMethodManagerWrapper;
 
     // Lazily created paste popup menu, triggered either via long press in an
     // editable region or from tapping the insertion handle.
     private PastePopupMenu mPastePopupMenu;
     private boolean mWasPastePopupShowingOnInsertionDragStart;
 
     // Size of the viewport in physical pixels as set from onSizeChanged.
     private int mViewportWidthPix;
     private int mViewportHeightPix;
@@ skipping 128 matching lines @@
 
     /**
      * Constructs a new ContentViewCore. Embedders must call initialize() after constructing
      * a ContentViewCore and before using it.
      *
      * @param context The context used to create this.
      */
     public ContentViewCore(Context context) {
         mContext = context;
 
-        mAdapterInputConnectionFactory = new AdapterInputConnectionFactory();
+        mInputConnectionFactory = new ChromiumBaseInputConnectionFactory();
         mInputMethodManagerWrapper = new InputMethodManagerWrapper(mContext);
 
         mRenderCoordinates = new RenderCoordinates();
         mJoystickScrollProvider = new JoystickScrollProvider(this);
         float deviceScaleFactor = getContext().getResources().getDisplayMetrics().density;
         String forceScaleFactor = CommandLine.getInstance().getSwitchValue(
                 ContentSwitches.FORCE_DEVICE_SCALE_FACTOR);
         if (forceScaleFactor != null) {
             deviceScaleFactor = Float.valueOf(forceScaleFactor);
         }
@@ skipping 80 matching lines @@
     public void setImeAdapterForTest(ImeAdapter imeAdapter) {
         mImeAdapter = imeAdapter;
     }
 
     @VisibleForTesting
     public ImeAdapter getImeAdapterForTest() {
         return mImeAdapter;
     }
 
     @VisibleForTesting
-    public void setAdapterInputConnectionFactory(AdapterInputConnectionFactory factory) {
-        mAdapterInputConnectionFactory = factory;
+    public void setInputConnectionFactory(ChromiumBaseInputConnectionFactory factory) {
+        mInputConnectionFactory = factory;
     }
 
     @VisibleForTesting
     public void setInputMethodManagerWrapperForTest(InputMethodManagerWrapper immw) {
         mInputMethodManagerWrapper = immw;
     }
 
     @VisibleForTesting
-    public AdapterInputConnection getInputConnectionForTest() {
+    public ChromiumBaseInputConnection getInputConnectionForTest() {
         return mInputConnection;
     }
 
     private ImeAdapter createImeAdapter() {
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
                         mPopupZoomer.hide(true);
                         getContentViewClient().onImeEvent();
@@ skipping 714 matching lines @@
         hidePopups();
     }
 
     private void hidePopupsAndPreserveSelection() {
         mUnselectAllOnActionModeDismiss = false;
         hidePopups();
     }
 
     private void clearUserSelection() {
         if (mFocusedNodeEditable) {
-            if (mInputConnection != null) {
+            if (mInputConnection != null
+                    && AdapterInputConnection.class.isInstance(mInputConnection)) {
                 int selectionEnd = Selection.getSelectionEnd(mEditable);
                 mInputConnection.setSelection(selectionEnd, selectionEnd);
             }
         } else if (mWebContents != null) {
             mWebContents.unselect();
         }
     }
 
     private void hidePopups() {
         hideSelectActionMode();
@@ skipping 72 matching lines @@
     /**
      * @see View#onCreateInputConnection(EditorInfo)
      */
     public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
         if (!mImeAdapter.hasTextInputType()) {
             // Although onCheckIsTextEditor will return false in this case, the EditorInfo
             // is still used by the InputMethodService. Need to make sure the IME doesn't
             // enter fullscreen mode.
             outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_FULLSCREEN;
         }
-        mInputConnection = mAdapterInputConnectionFactory.get(mContainerView, mImeAdapter,
-                mEditable, outAttrs);
+        mInputConnection =
+                mInputConnectionFactory.get(mContainerView, mImeAdapter, mEditable, outAttrs);

[AKV, 2015/11/04 17:20:49]

Is this factory stuff really needed ?, Can we remove this factory pattern and
return only one Connection object ?

[Changwan Ryu, 2016/01/19 07:31:52]

Since the AdapterInputConnection and ChromiumInputConnection act differently, I
think I still this factory pattern. Also, I need it for injecting test input
connection.

         return mInputConnection;
     }
 
-    @VisibleForTesting
-    public AdapterInputConnection getAdapterInputConnectionForTest() {
-        return mInputConnection;
-    }
-
     @VisibleForTesting
     public Editable getEditableForTest() {
         return mEditable;
     }
 
     /**
      * @see View#onCheckIsTextEditor()
      */
     public boolean onCheckIsTextEditor() {
         return mImeAdapter.hasTextInputType();
     }
 
     /**
      * @see View#onConfigurationChanged(Configuration)
      */
     @SuppressWarnings("javadoc")
     public void onConfigurationChanged(Configuration newConfig) {
         try {
             TraceEvent.begin("ContentViewCore.onConfigurationChanged");
 
             if (mCurrentConfig.keyboard != newConfig.keyboard
                     || mCurrentConfig.keyboardHidden != newConfig.keyboardHidden
                     || mCurrentConfig.hardKeyboardHidden != newConfig.hardKeyboardHidden) {
                 if (mNativeContentViewCore != 0) {
                     mImeAdapter.attach(nativeGetNativeImeAdapter(mNativeContentViewCore));
                 }
-                mInputMethodManagerWrapper.restartInput(mContainerView);
+                mImeAdapter.restartInput();
                 // By default, we show soft keyboard on keyboard changes. This is useful
                 // when the user transitions from hardware keyboard to software keyboard.
                 mImeAdapter.showSoftKeyboard();
             }
             mContainerViewInternals.super_onConfigurationChanged(newConfig);
 
             // To request layout has side effect, but it seems OK as it only happen in
             // onConfigurationChange and layout has to be changed in most case.
             mContainerView.requestLayout();
         } finally {
@@ skipping 846 matching lines @@
         try {
             TraceEvent.begin("ContentViewCore.updateImeAdapter");
             boolean focusedNodeEditable = (textInputType != TextInputType.NONE);
             boolean focusedNodeIsPassword = (textInputType == TextInputType.PASSWORD);
             if (!focusedNodeEditable) hidePastePopup();
 
             mImeAdapter.updateKeyboardVisibility(
                     nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded);
 
             if (mInputConnection != null) {
-                mInputConnection.updateState(text, selectionStart, selectionEnd, compositionStart,
-                        compositionEnd, isNonImeChange);
+                // TODO
+                if (mImeAdapter.mInputConnection != null) {
+                    mImeAdapter.mInputConnection.updateState(text, selectionStart, selectionEnd,
+                            compositionStart, compositionEnd, isNonImeChange);
+                }
             }
 
             if (mActionMode != null) {
                 final boolean actionModeConfigurationChanged =
                         focusedNodeEditable != mFocusedNodeEditable
                         || focusedNodeIsPassword != mFocusedNodeIsPassword;
                 if (actionModeConfigurationChanged) mActionMode.invalidate();
             }
 
             mFocusedNodeIsPassword = focusedNodeIsPassword;
@@ skipping 860 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);
 }