| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index b5c2144af693d81a646d761a33aecd3982a422b3..c14442d0fabbcea68f3107aaf292b4a715673bb6 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -1503,7 +1503,7 @@ public class ContentViewCore
|
| if (newConfig.keyboard != Configuration.KEYBOARD_NOKEYS) {
|
| if (mNativeContentViewCore != 0) {
|
| mImeAdapter.attach(nativeGetNativeImeAdapter(mNativeContentViewCore),
|
| - TextInputType.NONE, 0 /* no flags */);
|
| + TextInputType.NONE, 0 /* no mode */, 0 /* no flags */);
|
| }
|
| mInputMethodManagerWrapper.restartInput(mContainerView);
|
| }
|
| @@ -2277,16 +2277,17 @@ public class ContentViewCore
|
|
|
| @CalledByNative
|
| private void updateImeAdapter(long nativeImeAdapterAndroid, int textInputType,
|
| - int textInputFlags, String text, int selectionStart, int selectionEnd,
|
| - int compositionStart, int compositionEnd, boolean showImeIfNeeded,
|
| - boolean isNonImeChange) {
|
| + int textInputMode, int textInputFlags, String text,
|
| + int selectionStart, int selectionEnd, int compositionStart, int compositionEnd,
|
| + boolean showImeIfNeeded, boolean isNonImeChange) {
|
| try {
|
| TraceEvent.begin("ContentViewCore.updateImeAdapter");
|
| mFocusedNodeEditable = (textInputType != TextInputType.NONE);
|
| if (!mFocusedNodeEditable) hidePastePopup();
|
|
|
| mImeAdapter.updateKeyboardVisibility(
|
| - nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded);
|
| + nativeImeAdapterAndroid, textInputType, textInputMode, textInputFlags,
|
| + showImeIfNeeded);
|
|
|
| if (mInputConnection != null) {
|
| mInputConnection.updateState(text, selectionStart, selectionEnd, compositionStart,
|
|
|