Fix crash when showing multiple popups.

The problem is that calling hide/cancel on a popup is async.

With two popups, you would get

Previously:
SHOW A
HIDE A
SHOW B
NOTIFY SELECTION A
HIDE B
NOTIFY SELECTION B

When notifying the selection of A in the above scenario, it was
clearing the frame pointer (and actually updating the wrong popup).
Then when hiding the second popup, it's reference was actually gone
already.

Fix this by making the call to hide sync instead of async.

BUG=416354

Review URL: https://codereview.chromium.org/603303002

Cr-Commit-Position: refs/heads/master@{#296826}

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

@@ -2171,12 +2171,14 @@ public class ContentViewCore
             return;
         }
 
+        hidePopupsAndClearSelection();
+        assert mNativeSelectPopupSourceFrame == 0 : "Zombie popup did not clear the frame source";
+
         assert items.length == enabled.length;
         List<SelectPopupItem> popupItems = new ArrayList<SelectPopupItem>();
         for (int i = 0; i < items.length; i++) {
             popupItems.add(new SelectPopupItem(items[i], enabled[i]));
         }
-        hidePopupsAndClearSelection();
         if (DeviceFormFactor.isTablet(mContext) && !multiple) {
             mSelectPopup = new SelectPopupDropdown(this, popupItems, bounds, selectedIndices);
         } else {

content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDialog.java

@@ -29,11 +29,12 @@ public class SelectPopupDialog implements SelectPopup {
     };
 
     // The dialog hosting the popup list view.
-    private AlertDialog mListBoxPopup = null;
-
+    private final AlertDialog mListBoxPopup;
     private final ContentViewCore mContentViewCore;
     private final Context mContext;
 
+    private boolean mSelectionNotified;
+
     public SelectPopupDialog(ContentViewCore contentViewCore, List<SelectPopupItem> items,
             boolean multiple, int[] selected) {
         mContentViewCore = contentViewCore;
@@ -50,14 +51,14 @@ public class SelectPopupDialog implements SelectPopup {
             b.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    mContentViewCore.selectPopupMenuItems(getSelectedIndices(listView));
+                    notifySelection(getSelectedIndices(listView));
                 }
             });
             b.setNegativeButton(android.R.string.cancel,
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            mContentViewCore.selectPopupMenuItems(null);
+                            notifySelection(null);
                         }
                     });
         }
@@ -78,7 +79,7 @@ public class SelectPopupDialog implements SelectPopup {
                 @Override
                 public void onItemClick(AdapterView<?> parent, View v,
                         int position, long id) {
-                    mContentViewCore.selectPopupMenuItems(getSelectedIndices(listView));
+                    notifySelection(getSelectedIndices(listView));
                     mListBoxPopup.dismiss();
                 }
             });
@@ -90,7 +91,7 @@ public class SelectPopupDialog implements SelectPopup {
         mListBoxPopup.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
             public void onCancel(DialogInterface dialog) {
-                mContentViewCore.selectPopupMenuItems(null);
+                notifySelection(null);
             }
         });
     }
@@ -104,7 +105,7 @@ public class SelectPopupDialog implements SelectPopup {
         return resourceId;
     }
 
-    private int[] getSelectedIndices(ListView listView) {
+    private static int[] getSelectedIndices(ListView listView) {
         SparseBooleanArray sparseArray = listView.getCheckedItemPositions();
         int selectedCount = 0;
         for (int i = 0; i < sparseArray.size(); ++i) {
@@ -121,6 +122,12 @@ public class SelectPopupDialog implements SelectPopup {
         return indices;
     }
 
+    private void notifySelection(int[] indicies) {
+        if (mSelectionNotified) return;
+        mContentViewCore.selectPopupMenuItems(indicies);
+        mSelectionNotified = true;
+    }
+
     @Override
     public void show() {
         mListBoxPopup.show();
@@ -129,5 +136,6 @@ public class SelectPopupDialog implements SelectPopup {
     @Override
     public void hide() {
         mListBoxPopup.cancel();
+        notifySelection(null);
     }
 }

content/public/android/java/src/org/chromium/content/browser/input/SelectPopupDropdown.java

@@ -25,10 +25,10 @@ public class SelectPopupDropdown implements SelectPopup {
 
     private final ContentViewCore mContentViewCore;
     private final Context mContext;
+    private final DropdownPopupWindow mDropdownPopupWindow;
 
-    private DropdownPopupWindow mDropdownPopupWindow;
     private int mInitialSelection = -1;
-    private boolean mAlreadySelectedItems = false;
+    private boolean mSelectionNotified;
 
     public SelectPopupDropdown(ContentViewCore contentViewCore, List<SelectPopupItem> items,
             Rect bounds, int[] selected) {
@@ -39,9 +39,7 @@ public class SelectPopupDropdown implements SelectPopup {
         mDropdownPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                int[] selectedIndices = {position};
-                mContentViewCore.selectPopupMenuItems(selectedIndices);
-                mAlreadySelectedItems = true;
+                notifySelection(new int[] {position});
                 hide();
             }
         });
@@ -64,13 +62,17 @@ public class SelectPopupDropdown implements SelectPopup {
             new PopupWindow.OnDismissListener() {
                 @Override
                 public void onDismiss() {
-                    if (!mAlreadySelectedItems) {
-                        mContentViewCore.selectPopupMenuItems(null);
-                    }
+                    notifySelection(null);
                 }
             });
     }
 
+    private void notifySelection(int[] indicies) {
+        if (mSelectionNotified) return;
+        mContentViewCore.selectPopupMenuItems(indicies);
+        mSelectionNotified = true;
+    }
+
     @Override
     public void show() {
         mDropdownPopupWindow.show();
@@ -82,5 +84,6 @@ public class SelectPopupDropdown implements SelectPopup {
     @Override
     public void hide() {
         mDropdownPopupWindow.dismiss();
+        notifySelection(null);
     }
 }