Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1500)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java

Issue 14129003: Fix the incorrect native ImeAdapter attach and detach. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix nits Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
index 1ea57b4a105d086d732c319d68876474f895155f..354b24220c6ce2d07663d9ff6ca9cf89b8edb265 100644
--- a/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java
@@ -253,6 +253,9 @@ public class ImeAdapter {
public void attach(int nativeImeAdapter, int textInputType, int selectionStart,
int selectionEnd) {
+ if (mNativeImeAdapterAndroid != 0) {
+ nativeResetImeAdapter(mNativeImeAdapterAndroid);
+ }
mNativeImeAdapterAndroid = nativeImeAdapter;
mTextInputType = textInputType;
mInitialSelectionStart = selectionStart;
@@ -266,6 +269,9 @@ public class ImeAdapter {
* @param nativeImeAdapter The pointer to the native ImeAdapter object.
*/
public void attach(int nativeImeAdapter) {
+ if (mNativeImeAdapterAndroid != 0) {
+ nativeResetImeAdapter(mNativeImeAdapterAndroid);
+ }
mNativeImeAdapterAndroid = nativeImeAdapter;
if (nativeImeAdapter != 0) {
nativeAttachImeAdapter(mNativeImeAdapterAndroid);
@@ -569,4 +575,5 @@ public class ImeAdapter {
private native void nativeCut(int nativeImeAdapterAndroid);
private native void nativeCopy(int nativeImeAdapterAndroid);
private native void nativePaste(int nativeImeAdapterAndroid);
+ private native void nativeResetImeAdapter(int nativeImeAdapterAndroid);
}
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698