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 a01472a628829a5f6f15019651d132f1338f8d2b..cad2913e0b4ef1853e4366da14caf15a510adb8e 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 |
@@ -2324,7 +2324,10 @@ public class ContentViewCore |
float contentWidth, float contentHeight, |
float viewportWidth, float viewportHeight, |
float controlsOffsetYCss, float contentOffsetYCss, |
- boolean isMobileOptimizedHint) { |
+ boolean isMobileOptimizedHint, |
+ boolean hasInsertionMarker, boolean isInsertionMarkerVisible, |
+ float insertionMarkerHorizontal, float insertionMarkerTop, |
+ float insertionMarkerBottom) { |
TraceEvent.begin("ContentViewCore:updateFrameInfo"); |
mIsMobileOptimizedHint = isMobileOptimizedHint; |
// Adjust contentWidth/Height to be always at least as big as |
@@ -2391,6 +2394,11 @@ public class ContentViewCore |
if (mBrowserAccessibilityManager != null) { |
mBrowserAccessibilityManager.notifyFrameInfoInitialized(); |
} |
+ |
+ mImeAdapter.onUpdateFrameInfo(mRenderCoordinates, hasInsertionMarker, |
+ isInsertionMarkerVisible, insertionMarkerHorizontal, insertionMarkerTop, |
+ insertionMarkerBottom); |
+ |
TraceEvent.end("ContentViewCore:updateFrameInfo"); |
} |
@@ -2404,6 +2412,9 @@ public class ContentViewCore |
mFocusedNodeEditable = (textInputType != TextInputType.NONE); |
if (!mFocusedNodeEditable) hidePastePopup(); |
+ mImeAdapter.updateTextAndSelection(text, selectionStart, selectionEnd, compositionStart, |
+ compositionEnd); |
+ |
mImeAdapter.updateKeyboardVisibility( |
nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded); |