Set fields before calling ActionMode.invalidate()

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

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 9c490279d5e91417e6f40ccc2d2e07efd67872ec..b4251626bb0107b7408c8f48cf57bdbfbdbb5c21 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
@@ -907,13 +907,14 @@ public class SelectionPopupController extends ActionModeCallbackHelper {
 
     void updateSelectionState(boolean editable, boolean isPassword) {
         if (!editable) hidePastePopup();
-        if (isActionModeValid()
-                && (editable != isSelectionEditable() || isPassword != isSelectionPassword())) {
-            mActionMode.invalidate();
-            mNeedsPrepare = true;
+        if (editable != isSelectionEditable() || isPassword != isSelectionPassword()) {
+            mEditable = editable;
+            mIsPasswordType = isPassword;
+            if (isActionModeValid()) {
+                mNeedsPrepare = true;
+                mActionMode.invalidate();
+            }
         }
-        mEditable = editable;
-        mIsPasswordType = isPassword;
     }
 
     /**