| 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 e9af227ec12f4dd52f640f0b56a47cf1692a2d16..da258a945f4b4f0d615298843c1b36a1994335ae 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
|
| @@ -327,6 +327,9 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| @Override
|
| public void renderProcessGone(boolean wasOomProtected) {
|
| resetPopupsAndInput();
|
| + ContentViewCore contentViewCore = mWeakContentViewCore.get();
|
| + if (contentViewCore == null) return;
|
| + contentViewCore.mImeAdapter.resetAndHideKeyboard();
|
| }
|
|
|
| @Override
|
| @@ -340,7 +343,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| contentViewCore.mIsMobileOptimizedHint = false;
|
| contentViewCore.hidePopupsAndClearSelection();
|
| contentViewCore.resetScrollInProgress();
|
| - contentViewCore.mImeAdapter.reset();
|
| }
|
|
|
| private void determinedProcessVisibility() {
|
| @@ -982,7 +984,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| mWebContentsObserver = null;
|
| setSmartClipDataListener(null);
|
| setZoomControlsDelegate(null);
|
| - mImeAdapter.reset();
|
| + mImeAdapter.resetAndHideKeyboard();
|
| // TODO(igsolla): address TODO in ContentViewClient because ContentViewClient is not
|
| // currently a real Null Object.
|
| //
|
|
|