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 f32ec777efd211f0e59bcf39ea1d6b2b1dc7b87d..c1f44810459a33bf3dea41bac9014593dfe768e5 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 |
@@ -1487,7 +1487,7 @@ public class ContentViewCore |
if (newConfig.keyboard != Configuration.KEYBOARD_NOKEYS) { |
if (mNativeContentViewCore != 0) { |
mImeAdapter.attach(nativeGetNativeImeAdapter(mNativeContentViewCore), |
- ImeAdapter.getTextInputTypeNone(), 0 /* no flags */); |
+ ImeAdapter.getTextInputTypeNone(), 0 /* no mode */, 0 /* no flags */); |
} |
mInputMethodManagerWrapper.restartInput(mContainerView); |
} |
@@ -2247,16 +2247,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 != ImeAdapter.getTextInputTypeNone()); |
if (!mFocusedNodeEditable) hidePastePopup(); |
mImeAdapter.updateKeyboardVisibility( |
- nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded); |
+ nativeImeAdapterAndroid, textInputType, textInputMode, textInputFlags, |
+ showImeIfNeeded); |
if (mInputConnection != null) { |
mInputConnection.updateState(text, selectionStart, selectionEnd, compositionStart, |