[TTS] Add an ACK message to SelectWordAroundCaret.

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchContext.java

 // Copyright 2017 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.chrome.browser.contextualsearch;
 
 import android.text.TextUtils;
 
-import org.chromium.base.Log;
 import org.chromium.base.annotations.CalledByNative;
 
 import javax.annotation.Nullable;
 
 /**
  * Provides a context in which to search, and links to the native ContextualSearchContext.
  * Includes the selection, selection offsets, surrounding page content, etc.
  * Requires an override of #onSelectionChanged to call when a non-empty selection is established
  * or changed.
  */
 public abstract class ContextualSearchContext {
     static final int INVALID_SELECTION_OFFSET = -1;
-    private static final String TAG = "ContextualSearch";
 
     // Pointer to the native instance of this class.
     private long mNativePointer;
 
     // Whether this context has had the required properties set so it can Resolve a Search Term.
     private boolean mHasSetResolveProperties;
 
     // A shortened version of the actual text content surrounding the selection, or null if not yet
     // established.
     private String mSurroundingText;
@@ skipping 118 matching lines @@
     }
 
     /**
      * Notifies of an adjustment that has been applied to the start and end of the selection.
      * @param startAdjust A signed value indicating the direction of the adjustment to the start of
      *        the selection (typically a negative value when the selection expands).
      * @param endAdjust A signed value indicating the direction of the adjustment to the end of
      *        the selection (typically a positive value when the selection expands).
      */
     void onSelectionAdjusted(int startAdjust, int endAdjust) {
-        makeSelectionAdjustments(startAdjust, endAdjust);
-    }
-
-    /**
-     * Update the context based on the given selection.
-     * TODO(donnd): This method of finding the adjustment to the selection is unreliable!
-     * TODO(donnd): Replace by getting the selection adjustment directly from
-     *              {@link #onSelectionAdjusted} which is called by SelectWordAroundCaretAck
-     *              (since it knows how the selection was actually adjusted).
-     *              This method can be removed once SelectWordAroundCaretAck is in place.
-     *              See crbug.com/435778 for details.
-     * @param selection The new selection.
-     */
-    void updateContextFromSelection(String selection) {
-        mInitialSelectedWord = selection;
-        if (mSelectionStartOffset == INVALID_SELECTION_OFFSET
-                || mSelectionEndOffset == INVALID_SELECTION_OFFSET
-                || TextUtils.isEmpty(mSurroundingText) || TextUtils.isEmpty(selection)) {
-            return;
-        }
-
-        int selectionLength = selection.length();
-        for (int i = 0; i <= selectionLength; i++) {
-            int possibleStart = mSelectionStartOffset - i;
-            int possibleEnd = possibleStart + selectionLength;
-            if (possibleStart >= 0 && possibleEnd <= mSurroundingText.length()
-                    && selection.equals(mSurroundingText.substring(possibleStart, possibleEnd))) {
-                makeSelectionAdjustments(-i, selectionLength - i);
-                return;
-            }
-        }
-
-        Log.w(TAG, "Warning, unable to update context from the selection!");
-    }
-
-    /**
-     * Makes adjustments to the selection offsets.
-     * @param startAdjust A signed value indicating the direction of the adjustment to the start of
-     *        the selection (typically a negative value when the selection expands).
-     * @param endAdjust A signed value indicating the direction of the adjustment to the end of
-     *        the selection (typically a positive value when the selection expands).
-     */
-    private void makeSelectionAdjustments(int startAdjust, int endAdjust) {
         nativeAdjustSelection(getNativePointer(), startAdjust, endAdjust);
         // Fully track the selection as it changes.
         mSelectionStartOffset += startAdjust;
         mSelectionEndOffset += endAdjust;
+        if (TextUtils.isEmpty(mInitialSelectedWord) && !TextUtils.isEmpty(mSurroundingText)) {
+            mInitialSelectedWord =
+                    mSurroundingText.substring(mSelectionStartOffset, mSelectionEndOffset);
+        }
         // Notify of changes.
         onSelectionChanged();
     }
 
     /**
      * Notifies this instance that the selection has been changed.
      */
     abstract void onSelectionChanged();
 
     // TODO(donnd): Add a test for this class!
@@ skipping 11 matching lines @@
     // ============================================================================================
     // Native methods.
     // ============================================================================================
     private native long nativeInit();
     private native void nativeDestroy(long nativeContextualSearchContext);
     private native void nativeSetResolveProperties(
             long nativeContextualSearchContext, String homeCountry, boolean maySendBasePageUrl);
     private native void nativeAdjustSelection(
             long nativeContextualSearchContext, int startAdjust, int endAdjust);
 }