Index: content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java |
index 8d9c66e4913e7dbcb70f356c1bf969a0af14d8e1..f992a243f5afdc511bb038a0f0ce1dd264618ae7 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java |
@@ -91,7 +91,6 @@ public class SelectionPopupController extends ActionModeCallbackHelper { |
private int mAllowedMenuItems; |
private boolean mHidden; |
- private boolean mPendingInvalidateContentRect; |
private boolean mEditable; |
private boolean mIsPasswordType; |
@@ -307,7 +306,6 @@ public class SelectionPopupController extends ActionModeCallbackHelper { |
assert canHideActionMode(); |
mHidden = false; |
mView.removeCallbacks(mRepeatingHideRunnable); |
- mPendingInvalidateContentRect = false; |
} |
// Try/catch necessary for framework bug, crbug.com/446717. |
@@ -322,13 +320,8 @@ public class SelectionPopupController extends ActionModeCallbackHelper { |
* @see ActionMode#invalidateContentRect() |
*/ |
public void invalidateContentRect() { |
- if (supportsFloatingActionMode()) { |
- if (mHidden) { |
- mPendingInvalidateContentRect = true; |
- } else { |
- mPendingInvalidateContentRect = false; |
- if (isActionModeValid()) mActionMode.invalidateContentRect(); |
- } |
+ if (supportsFloatingActionMode() && isActionModeValid()) { |
+ mActionMode.invalidateContentRect(); |
} |
} |
@@ -356,10 +349,6 @@ public class SelectionPopupController extends ActionModeCallbackHelper { |
mHidden = false; |
mView.removeCallbacks(mRepeatingHideRunnable); |
hideActionModeTemporarily(SHOW_DELAY_MS); |
- if (mPendingInvalidateContentRect) { |
- mPendingInvalidateContentRect = false; |
- invalidateContentRect(); |
- } |
} |
} |