| Index: content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| index a0857e026c85160b93e9389a17f5edfa4d0abb5d..a1f35b346c9c6771c281672df48ba246a1b8c30b 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
|
| @@ -24,6 +24,7 @@ import android.widget.FrameLayout;
|
|
|
| import org.chromium.base.Log;
|
| import org.chromium.base.TraceEvent;
|
| +import org.chromium.base.annotations.SuppressFBWarnings;
|
|
|
| /**
|
| * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
|
| @@ -47,6 +48,19 @@ public class ContentView extends FrameLayout
|
| private int mDesiredWidthMeasureSpec = DEFAULT_MEASURE_SPEC;
|
| private int mDesiredHeightMeasureSpec = DEFAULT_MEASURE_SPEC;
|
|
|
| + private static ThreadLocal<Boolean> sTriggerDelayedOnCreateInputConnection =
|
| + new ThreadLocal<Boolean>() {
|
| + @SuppressFBWarnings("CHROMIUM_SYNCHRONIZED_METHOD")
|
| + @Override
|
| + protected synchronized Boolean initialValue() {
|
| + return true;
|
| + }
|
| + };
|
| +
|
| + public void setTriggerDelayedOnCreateInputConnection(final boolean trigger) {
|
| + sTriggerDelayedOnCreateInputConnection.set(trigger);
|
| + }
|
| +
|
| /**
|
| * Constructs a new ContentView for the appropriate Android version.
|
| * @param context The Context the view is running in, through which it can
|
| @@ -140,6 +154,8 @@ public class ContentView extends FrameLayout
|
|
|
| @Override
|
| public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
|
| + mContentViewCore.setTriggerDelayedOnCreateInputConnection(
|
| + sTriggerDelayedOnCreateInputConnection.get());
|
| return mContentViewCore.onCreateInputConnection(outAttrs);
|
| }
|
|
|
|
|