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 d1d208aabc795e55050765a43c5acbb96f9cd3bd..eda6f1536e3f0884d597db9e65bcac6fb866f2df 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 |
@@ -51,9 +51,9 @@ public class ImeAdapter { |
} |
private class DelayedDismissInput implements Runnable { |
- private final int mNativeImeAdapter; |
+ private final long mNativeImeAdapter; |
- DelayedDismissInput(int nativeImeAdapter) { |
+ DelayedDismissInput(long nativeImeAdapter) { |
mNativeImeAdapter = nativeImeAdapter; |
} |
@@ -95,7 +95,7 @@ public class ImeAdapter { |
static int sModifierCapsLockOn; |
static int sModifierNumLockOn; |
- private int mNativeImeAdapterAndroid; |
+ private long mNativeImeAdapterAndroid; |
private InputMethodManagerWrapper mInputMethodManagerWrapper; |
private AdapterInputConnection mInputConnection; |
private final ImeAdapterDelegate mViewEmbedder; |
@@ -234,7 +234,7 @@ public class ImeAdapter { |
} |
} |
- public void attach(int nativeImeAdapter, int textInputType, int selectionStart, |
+ public void attach(long nativeImeAdapter, int textInputType, int selectionStart, |
int selectionEnd) { |
if (mNativeImeAdapterAndroid != 0) { |
nativeResetImeAdapter(mNativeImeAdapterAndroid); |
@@ -253,7 +253,7 @@ public class ImeAdapter { |
* keyboard events to WebKit. |
* @param nativeImeAdapter The pointer to the native ImeAdapter object. |
*/ |
- public void attach(int nativeImeAdapter) { |
+ public void attach(long nativeImeAdapter) { |
if (mNativeImeAdapterAndroid != 0) { |
nativeResetImeAdapter(mNativeImeAdapterAndroid); |
} |
@@ -504,34 +504,34 @@ public class ImeAdapter { |
mTextInputType = 0; |
} |
- private native boolean nativeSendSyntheticKeyEvent(int nativeImeAdapterAndroid, |
+ private native boolean nativeSendSyntheticKeyEvent(long nativeImeAdapterAndroid, |
int eventType, long timestampMs, int keyCode, int unicodeChar); |
- private native boolean nativeSendKeyEvent(int nativeImeAdapterAndroid, KeyEvent event, |
+ private native boolean nativeSendKeyEvent(long nativeImeAdapterAndroid, KeyEvent event, |
int action, int modifiers, long timestampMs, int keyCode, boolean isSystemKey, |
int unicodeChar); |
- private native void nativeSetComposingText(int nativeImeAdapterAndroid, String text, |
+ private native void nativeSetComposingText(long nativeImeAdapterAndroid, String text, |
int newCursorPosition); |
- private native void nativeCommitText(int nativeImeAdapterAndroid, String text); |
+ private native void nativeCommitText(long nativeImeAdapterAndroid, String text); |
- private native void nativeFinishComposingText(int nativeImeAdapterAndroid); |
+ private native void nativeFinishComposingText(long nativeImeAdapterAndroid); |
- private native void nativeAttachImeAdapter(int nativeImeAdapterAndroid); |
+ private native void nativeAttachImeAdapter(long nativeImeAdapterAndroid); |
- private native void nativeSetEditableSelectionOffsets(int nativeImeAdapterAndroid, |
+ private native void nativeSetEditableSelectionOffsets(long nativeImeAdapterAndroid, |
int start, int end); |
- private native void nativeSetComposingRegion(int nativeImeAdapterAndroid, int start, int end); |
+ private native void nativeSetComposingRegion(long nativeImeAdapterAndroid, int start, int end); |
- private native void nativeDeleteSurroundingText(int nativeImeAdapterAndroid, |
+ private native void nativeDeleteSurroundingText(long nativeImeAdapterAndroid, |
int before, int after); |
- private native void nativeUnselect(int nativeImeAdapterAndroid); |
- private native void nativeSelectAll(int nativeImeAdapterAndroid); |
- private native void nativeCut(int nativeImeAdapterAndroid); |
- private native void nativeCopy(int nativeImeAdapterAndroid); |
- private native void nativePaste(int nativeImeAdapterAndroid); |
- private native void nativeResetImeAdapter(int nativeImeAdapterAndroid); |
+ private native void nativeUnselect(long nativeImeAdapterAndroid); |
+ private native void nativeSelectAll(long nativeImeAdapterAndroid); |
+ private native void nativeCut(long nativeImeAdapterAndroid); |
+ private native void nativeCopy(long nativeImeAdapterAndroid); |
+ private native void nativePaste(long nativeImeAdapterAndroid); |
+ private native void nativeResetImeAdapter(long nativeImeAdapterAndroid); |
} |