Revert of Removed SelectionPopupController.invalidateActionMode()

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

 // Copyright 2015 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.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 176 matching lines @@
     /**
      * Show (activate) android action mode by starting it.
      *
      * <p>Action mode in floating mode is tried first, and then falls back to
      * a normal one.
      * @return {@code true} if the action mode started successfully or is already on.
      */
     public boolean showActionMode() {
         if (isEmpty()) return false;
 
-        destroyActionModeAndKeepSelection();
+        // Just refreshes the view if it is already showing.
+        if (isActionModeValid()) {
+            invalidateActionMode();
+            return true;
+        }
 
         if (mView.getParent() != null) {
              // On ICS, startActionMode throws an NPE when getParent() is null.
             assert mWebContents != null;
             ActionMode actionMode = supportsFloatingActionMode()
                     ? startFloatingActionMode()
                     : mView.startActionMode(mCallback);
             if (actionMode != null) {
                 // This is to work around an LGE email issue. See crbug.com/651706 for more details.
                 LGEmailActionModeWorkaround.runIfNecessary(mContext, actionMode);
@@ skipping 77 matching lines @@
     @Override
     public void finishActionMode() {
         if (isActionModeValid()) {
             mActionMode.finish();
 
             // Should be nulled out in case #onDestroyActionMode() is not invoked in response.
             mActionMode = null;
         }
     }
 
+    /**
+     * @see ActionMode#invalidate()
+     * Note that invalidation will also reset visibility state. The caller
+     * should account for this when making subsequent visibility updates.
+     */
+    private void invalidateActionMode() {
+        if (!isActionModeValid()) return;
+        if (mHidden) {
+            assert canHideActionMode();
+            mHidden = false;
+            mView.removeCallbacks(mRepeatingHideRunnable);
+            mPendingInvalidateContentRect = false;
+        }
+
+        // Try/catch necessary for framework bug, crbug.com/446717.
+        try {
+            mActionMode.invalidate();
+        } catch (NullPointerException e) {
+            Log.w(TAG, "Ignoring NPE from ActionMode.invalidate() as workaround for L", e);
+        }
+    }
+
     /**
      * @see ActionMode#invalidateContentRect()
      */
     public void invalidateContentRect() {
         if (supportsFloatingActionMode()) {
             if (mHidden) {
                 mPendingInvalidateContentRect = true;
             } else {
                 mPendingInvalidateContentRect = false;
                 if (isActionModeValid()) mActionMode.invalidateContentRect();
@@ skipping 572 matching lines @@
         mIsInsertion = insertion;
     }
 
     private boolean isShareAvailable() {
         Intent intent = new Intent(Intent.ACTION_SEND);
         intent.setType("text/plain");
         return mContext.getPackageManager().queryIntentActivities(intent,
                 PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
     }
 }