Simplify protocol between SELECT elements and popups.

third_party/WebKit/Source/web/ExternalPopupMenu.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 176 matching lines @@
 
 void ExternalPopupMenu::didAcceptIndex(int index)
 {
     // Calling methods on the HTMLSelectElement might lead to this object being
     // derefed. This ensures it does not get deleted while we are running this
     // method.
     int popupMenuItemIndex = toPopupMenuItemIndex(index, *m_ownerElement);
 
     if (m_ownerElement) {
         m_ownerElement->popupDidHide();
-        m_ownerElement->valueChanged(popupMenuItemIndex);
+        m_ownerElement->selectOptionByPopup(popupMenuItemIndex);
     }
     m_webExternalPopupMenu = 0;
 }
 
+// Android uses this function even for single SELECT.
 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices)
 {
     if (!m_ownerElement) {
         m_webExternalPopupMenu = 0;
         return;
     }
 
     HTMLSelectElement* ownerElement = m_ownerElement;
     ownerElement->popupDidHide();
 
     if (indices.size() == 0) {
-        ownerElement->valueChanged(static_cast<unsigned>(-1));
+        ownerElement->selectOptionByPopup(-1);
+    } else if (!ownerElement->multiple()) {
+        ownerElement->selectOptionByPopup(toPopupMenuItemIndex(indices[indices.size() - 1], *ownerElement));
     } else {
+        Vector<int> listIndices;
+        listIndices.reserveCapacity(indices.size());
         for (size_t i = 0; i < indices.size(); ++i)
-            ownerElement->listBoxSelectItem(toPopupMenuItemIndex(indices[i], *ownerElement), (i > 0), (i == indices.size() - 1));
+            listIndices.append(toPopupMenuItemIndex(indices[i], *ownerElement));
+        ownerElement->selectMultipleOptionsByPopup(listIndices);
     }
 
     m_webExternalPopupMenu = 0;
 }
 
 void ExternalPopupMenu::didCancel()
 {
     if (m_ownerElement)
         m_ownerElement->popupDidHide();
     m_webExternalPopupMenu = 0;
@@ skipping 67 matching lines @@
         if (ownerElement.itemIsDisplayNone(*items[i]))
             continue;
         if (popupMenuItemIndex == i)
             return indexTracker;
         ++indexTracker;
     }
     return -1;
 }
 
 } // namespace blink