| 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 8bf444f5ed53e72ca43ced352770cbbd734ce447..12e609d3b5b17dd9485c5f18dfb5a73c8d558586 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
|
| @@ -460,8 +460,8 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| setContainerViewInternals(internalDispatcher);
|
|
|
| initPopupZoomer(mContext);
|
| - mImeAdapter = new ImeAdapter(
|
| - mWebContents, mContainerView, new InputMethodManagerWrapper(mContext));
|
| + mImeAdapter = new ImeAdapter(mWebContents, mContainerView,
|
| + new InputMethodManagerWrapper(mContext), mRenderCoordinates);
|
| mImeAdapter.addEventObserver(this);
|
|
|
| mSelectionPopupController = new SelectionPopupController(
|
| @@ -986,6 +986,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| destroyPastePopup();
|
| hideSelectPopupWithCancelMessage();
|
| mPopupZoomer.hide(false);
|
| + mImeAdapter.hidePopups();
|
| }
|
|
|
| private void restoreSelectionPopupsIfNecessary() {
|
| @@ -2202,6 +2203,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Displa
|
| hidePopupsAndPreserveSelection();
|
| showSelectActionMode();
|
| }
|
| + mImeAdapter.hidePopups();
|
|
|
| int rotationDegrees = 0;
|
| switch (rotation) {
|
|
|