Clear the selection when hiding the handles

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright 2012 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;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 1297 matching lines @@
      * @return A ContentSettings object that can be used to retrieve this
      *         ContentViewCore's settings.
      */
     public ContentSettings getContentSettings() {
         return mContentSettings;
     }
 
     private void hidePopupsAndClearSelection() {
         mUnselectAllOnActionModeDismiss = true;
         hidePopups();
+        // Clear the selection. The selection is cleared on destroying IME
+        // and also here since we may receive destroy first, for example
+        // when focus is lost in webview.
+        clearUserSelection();
     }
 
     private void hidePopupsAndPreserveSelection() {
         mUnselectAllOnActionModeDismiss = false;
         hidePopups();
     }
 
+    private void clearUserSelection() {
+        if (isSelectionEditable()) {
+            if (mInputConnection != null) {
+                int selectionEnd = Selection.getSelectionEnd(mEditable);
+                mInputConnection.setSelection(selectionEnd, selectionEnd);
+            }
+        } else if (mImeAdapter != null) {
+            mImeAdapter.unselect();
+        }
+    }
+
     private void hidePopups() {
         hideSelectActionBar();
         hidePastePopup();
         hideSelectPopup();
         mPopupZoomer.hide(false);
         if (mUnselectAllOnActionModeDismiss) hideTextHandles();
     }
 
     private void restoreSelectionPopupsIfNecessary() {
         if (mHasSelection && mActionMode == null) showSelectActionBar();
@@ skipping 585 matching lines @@
                 @Override
                 public boolean isSelectionEditable() {
                     return mFocusedNodeEditable;
                 }
 
                 @Override
                 public void onDestroyActionMode() {
                     mActionMode = null;
                     if (mUnselectAllOnActionModeDismiss) {
                         hideTextHandles();
-                        if (isSelectionEditable()) {
-                            int selectionEnd = Selection.getSelectionEnd(mEditable);
-                            mInputConnection.setSelection(selectionEnd, selectionEnd);
-                        } else {
-                            mImeAdapter.unselect();
-                        }
+                        clearUserSelection();
                     }
                     getContentViewClient().onContextualActionBarHidden();
                 }
 
                 @Override
                 public boolean isShareAvailable() {
                     Intent intent = new Intent(Intent.ACTION_SEND);
                     intent.setType("text/plain");
                     return getContext().getPackageManager().queryIntentActivities(intent,
                             PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
@@ skipping 1081 matching lines @@
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }