Removing mPendingInvalidateContentRect

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 73 matching lines @@
     // required because ActionMode only exposes a temporary hide routine.
     private final Runnable mRepeatingHideRunnable;
 
     private View mView;
     private ActionMode mActionMode;
 
     // Bit field for mappings from menu item to a flag indicating it is allowed.
     private int mAllowedMenuItems;
 
     private boolean mHidden;
-    private boolean mPendingInvalidateContentRect;
 
     private boolean mEditable;
     private boolean mIsPasswordType;
     private boolean mIsInsertion;
 
     // Indicates whether the action mode needs to be redrawn since last invalidation.
     private boolean mNeedsPrepare;
 
     private boolean mUnselectAllOnDismiss;
     private String mLastSelectedText;
@@ skipping 195 matching lines @@
      * @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();
-            }
+        if (supportsFloatingActionMode() && isActionModeValid()) {
+            mActionMode.invalidateContentRect();
         }
     }
 
     /**
      * @see ActionMode#onWindowFocusChanged()
      */
     void onWindowFocusChanged(boolean hasWindowFocus) {
         if (supportsFloatingActionMode() && isActionModeValid()) {
             mActionMode.onWindowFocusChanged(hasWindowFocus);
         }
     }
 
     /**
      * Hide or reveal the ActionMode. Note that this only has visible
      * side-effects if the underlying ActionMode supports hiding.
      * @param hide whether to hide or show the ActionMode.
      */
     void hideActionMode(boolean hide) {
         if (!canHideActionMode()) return;
         if (mHidden == hide) return;
         mHidden = hide;
         if (mHidden) {
             mRepeatingHideRunnable.run();
         } else {
             mHidden = false;
             mView.removeCallbacks(mRepeatingHideRunnable);
             hideActionModeTemporarily(SHOW_DELAY_MS);
-            if (mPendingInvalidateContentRect) {
-                mPendingInvalidateContentRect = false;
-                invalidateContentRect();
-            }
         }
     }
 
     /**
      * @see ActionMode#hide(long)
      */
     private void hideActionModeTemporarily(long duration) {
         assert canHideActionMode();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (isActionModeValid()) mActionMode.hide(duration);
@@ skipping 530 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;
     }
 }