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

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

Issue 2752113005: Let ImeAdapterAndroid have the same lifecycle as its Java peer (Closed)
Patch Set: comments Created 3 years, 9 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
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 2a2b5993baf93fca8d61ee25615cfa2f191a5217..579e11d4d0992560cfd668dd39d197d3bffdb033 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
@@ -494,8 +494,8 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
}
private ImeAdapter createImeAdapter() {
- return new ImeAdapter(
- new InputMethodManagerWrapper(mContext), new ImeAdapter.ImeAdapterDelegate() {
+ return new ImeAdapter(mWebContents, new InputMethodManagerWrapper(mContext),
+ new ImeAdapter.ImeAdapterDelegate() {
@Override
public void onImeEvent() {
mPopupZoomer.hide(true);
@@ -583,10 +583,9 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
initPopupZoomer(mContext);
mImeAdapter = createImeAdapter();
- attachImeAdapter();
mSelectionPopupController = new SelectionPopupController(mContext, windowAndroid,
- webContents, viewDelegate.getContainerView(), mRenderCoordinates, mImeAdapter);
+ webContents, viewDelegate.getContainerView(), mRenderCoordinates);
mSelectionPopupController.setCallback(ActionModeCallbackHelper.EMPTY_CALLBACK);
mSelectionPopupController.setContainerView(getContainerView());
@@ -1776,16 +1775,14 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
}
@CalledByNative
- private void updateImeAdapter(long nativeImeAdapterAndroid, int textInputType,
- int textInputFlags, int textInputMode, String text, int selectionStart,
- int selectionEnd, int compositionStart, int compositionEnd, boolean showImeIfNeeded,
- boolean replyToRequest) {
+ private void updateImeAdapter(int textInputType, int textInputFlags, int textInputMode,
+ String text, int selectionStart, int selectionEnd, int compositionStart,
+ int compositionEnd, boolean showImeIfNeeded, boolean replyToRequest) {
try {
TraceEvent.begin("ContentViewCore.updateImeAdapter");
boolean focusedNodeEditable = (textInputType != TextInputType.NONE);
boolean focusedNodeIsPassword = (textInputType == TextInputType.PASSWORD);
- mImeAdapter.attach(nativeImeAdapterAndroid);
mImeAdapter.updateState(textInputType, textInputFlags, textInputMode, showImeIfNeeded,
text, selectionStart, selectionEnd, compositionStart, compositionEnd,
replyToRequest);
@@ -1802,11 +1799,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
}
}
- @CalledByNative
- private void forceUpdateImeAdapter(long nativeImeAdapterAndroid) {
- mImeAdapter.attach(nativeImeAdapterAndroid);
- }
-
/**
* Called (from native) when the <select> popup needs to be shown.
* @param anchorView View anchored for popup.
@@ -1917,21 +1909,11 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
@SuppressWarnings("unused")
@CalledByNative
private void onRenderProcessChange() {
- attachImeAdapter();
// Immediately sync closed caption settings to the new render process.
mSystemCaptioningBridge.syncToListener(this);
}
/**
- * Attaches the native ImeAdapter object to the java ImeAdapter to allow communication via JNI.
- */
- public void attachImeAdapter() {
- if (mImeAdapter != null && mNativeContentViewCore != 0) {
- mImeAdapter.attach(nativeGetNativeImeAdapter(mNativeContentViewCore));
- }
- }
-
- /**
* @see View#hasFocus()
*/
@CalledByNative
@@ -2675,9 +2657,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
private native void nativeSelectPopupMenuItems(long nativeContentViewCoreImpl,
long nativeSelectPopupSourceFrame, int[] indices);
-
- private native long nativeGetNativeImeAdapter(long nativeContentViewCoreImpl);
-
private native int nativeGetCurrentRenderProcessId(long nativeContentViewCoreImpl);
private native void nativeSetAllowJavascriptInterfacesInspection(

Powered by Google App Engine
This is Rietveld 408576698