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

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

Issue 1278593004: Introduce ThreadedInputConnection behind a switch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: handles render crash and navigation Created 4 years, 11 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 9f2b522601a2a8fdbf70faed4e447e521631f6e4..63fbffd5e8735906d659dab2632be1b501e71955 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
@@ -334,6 +334,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
contentViewCore.mIsMobileOptimizedHint = false;
contentViewCore.hidePopupsAndClearSelection();
contentViewCore.resetScrollInProgress();
+ contentViewCore.resetImeAdapter();
Ted C 2016/02/02 23:14:42 you can just do contentViewCore.mImeAdapter.reset(
Changwan Ryu 2016/02/11 16:21:07 Done.
Ted C 2016/02/17 19:09:33 Looks like this didn't land?
Changwan Ryu 2016/02/18 06:03:26 My bad, it's done now.
}
private void determinedProcessVisibility() {
@@ -934,6 +935,7 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
mWebContentsObserver = null;
setSmartClipDataListener(null);
setZoomControlsDelegate(null);
+ mImeAdapter.reset();
// TODO(igsolla): address TODO in ContentViewClient because ContentViewClient is not
// currently a real Null Object.
//
@@ -3088,6 +3090,11 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
}
}
+ @VisibleForTesting
+ public WebContentsObserver getWebContentsObserverForTest() {
+ return mWebContentsObserver;
+ }
+
/**
* Offer a long press gesture to the embedding View, primarily for WebView compatibility.
*
@@ -3113,6 +3120,10 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
if (potentiallyActiveFlingCount > 0) updateGestureStateListener(GestureEventType.FLING_END);
}
+ private void resetImeAdapter() {
+ mImeAdapter.reset();
+ }
+
private float getWheelScrollFactorInPixels() {
if (mWheelScrollFactorInPixels == 0) {
TypedValue outValue = new TypedValue();

Powered by Google App Engine
This is Rietveld 408576698