Revert of Do not calculate composition bounds until IME requests.

content/public/android/java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser.input;
 
 import android.annotation.TargetApi;
 import android.graphics.Matrix;
 import android.os.Build;
 import android.view.View;
 import android.view.inputmethod.CursorAnchorInfo;
+import android.view.inputmethod.InputConnection;
 
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.content.browser.RenderCoordinates;
 
 import java.util.Arrays;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ skipping 99 matching lines @@
      */
     public void invalidateLastCursorAnchorInfo() {
         if (!mIsEditable) return;
 
         mLastCursorAnchorInfo = null;
     }
 
     /**
      * Sets positional information of composing text as an array of character bounds.
      * @param compositionCharacterBounds Array of character bounds in local coordinates.
-     * @param view The attached view.
      */
-    public void setCompositionCharacterBounds(float[] compositionCharacterBounds, View view) {
+    public void setCompositionCharacterBounds(float[] compositionCharacterBounds) {
         if (!mIsEditable) return;
 
         if (!Arrays.equals(compositionCharacterBounds, mCompositionCharacterBounds)) {
             mLastCursorAnchorInfo = null;
             mCompositionCharacterBounds = compositionCharacterBounds;
         }
-        updateCursorAnchorInfo(view);
     }
 
     /**
      * Sets coordinates system parameters and selection marker information.
      * @param hasInsertionMarker {@code true} if the insertion marker exists.
      * @param isInsertionMarkerVisible {@code true} if the insertion insertion marker is visible.
      * @param insertionMarkerHorizontal X coordinate of the top of the first selection marker.
      * @param insertionMarkerTop Y coordinate of the top of the first selection marker.
      * @param insertionMarkerBottom Y coordinate of the bottom of the first selection marker.
      * @param view The attached view.
@@ skipping 41 matching lines @@
         }
 
         // Notify to IME if there is a pending request, or if it is in monitor mode and we have
         // some change in the state.
         if (mHasPendingImmediateRequest
                 || (mMonitorModeEnabled && mLastCursorAnchorInfo == null)) {
             updateCursorAnchorInfo(view);
         }
     }
 
+    /**
+     * Resets the current state on update monitoring mode to the default (= do nothing.)
+     */
+    public void resetMonitoringState() {
+        mMonitorModeEnabled = false;
+        mHasPendingImmediateRequest = false;
+    }
+
     public void focusedNodeChanged(boolean isEditable) {
         mIsEditable = isEditable;
         mCompositionCharacterBounds = null;
         mHasCoordinateInfo = false;
         mLastCursorAnchorInfo = null;
     }
 
-    public boolean onRequestCursorUpdates(boolean immediateRequest, boolean monitorRequest,
-            View view) {
+    public boolean onRequestCursorUpdates(int cursorUpdateMode, View view) {
         if (!mIsEditable) return false;
 
-        if (mMonitorModeEnabled && !monitorRequest) {
-            // Invalidate saved cursor anchor info if monitor request is cancelled since no longer
-            // new values will be arrived from renderer and immediate request may return too old
-            // position.
-            invalidateLastCursorAnchorInfo();
-        }
-        mMonitorModeEnabled = monitorRequest;
-        if (immediateRequest) {
+        mMonitorModeEnabled = (cursorUpdateMode & InputConnection.CURSOR_UPDATE_MONITOR) != 0;
+        if ((cursorUpdateMode & InputConnection.CURSOR_UPDATE_IMMEDIATE) != 0) {
             mHasPendingImmediateRequest = true;
             updateCursorAnchorInfo(view);
         }
         return true;
     }
 
     /**
      * Computes the CursorAnchorInfo instance and notify to InputMethodManager if needed.
      */
     private void updateCursorAnchorInfo(View view) {
@@ skipping 40 matching lines @@
             }
             mLastCursorAnchorInfo = mCursorAnchorInfoBuilder.build();
         }
 
         if (mInputMethodManagerWrapper != null) {
             mInputMethodManagerWrapper.updateCursorAnchorInfo(view, mLastCursorAnchorInfo);
         }
         mHasPendingImmediateRequest = false;
     }
 }