Simplify protocol between SELECT elements and popups.

third_party/WebKit/Source/core/html/HTMLSelectElement.cpp

 /*
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
@@ skipping 190 matching lines @@
     return firstSelectionIndex < 0 || (!firstSelectionIndex && hasPlaceholderLabelOption());
 }
 
 String HTMLSelectElement::defaultToolTip() const
 {
     if (form() && form()->noValidate())
         return String();
     return validationMessage();
 }
 
-void HTMLSelectElement::listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool fireOnChangeNow)
+void HTMLSelectElement::selectMultipleOptionsByPopup(const Vector<int>& listIndices)
 {
-    if (!multiple()) {
-        optionSelectedByUser(listToOptionIndex(listIndex), fireOnChangeNow);
-    } else {
-        HTMLElement* element = listItems()[listIndex];
+    DCHECK(usesMenuList());
+    DCHECK(!multiple());

[wychen, 2016/09/29 02:42:57]

Should this line be DCHECK(multiple())? I'm a bit confused.

[tkent, 2016/09/29 03:14:55]

I think so :)

+    for (size_t i = 0; i < listIndices.size(); ++i) {
+        bool addSelectionIfNotFirst = i > 0;
+        HTMLElement* element = listItems()[listIndices[i]];
         if (isHTMLOptionElement(element))
-            updateSelectedState(toHTMLOptionElement(element), allowMultiplySelections, false);
-        setNeedsValidityCheck();
-        if (fireOnChangeNow)
-            listBoxOnChange();
+            updateSelectedState(toHTMLOptionElement(element), addSelectionIfNotFirst, false);
     }
+    setNeedsValidityCheck();
+    // TODO(tkent): Using listBoxOnChange() is very confusing.
+    listBoxOnChange();
 }
 
 bool HTMLSelectElement::usesMenuList() const
 {
     if (LayoutTheme::theme().delegatesMenuListRendering())
         return true;
 
     return !m_multiple && m_size <= 1;
 }
 
@@ skipping 1027 matching lines @@
 void HTMLSelectElement::handlePopupOpenKeyboardEvent(Event* event)
 {
     focus();
     // Calling focus() may cause us to lose our layoutObject. Return true so
     // that our caller doesn't process the event further, but don't set
     // the event as handled.
     if (!layoutObject() || !layoutObject()->isMenuList() || isDisabledFormControl())
         return;
     // Save the selection so it can be compared to the new selection when
     // dispatching change events during selectOption, which gets called from
-    // valueChanged, which gets called after the user makes a selection from the
-    // menu.
+    // selectOptionByPopup, which gets called after the user makes a selection
+    // from the menu.
     saveLastSelection();
     showPopup();
     event->setDefaultHandled();
     return;
 }
 
 bool HTMLSelectElement::shouldOpenPopupForKeyDownEvent(KeyboardEvent* keyEvent)
 {
     const String& key = keyEvent->key();
     LayoutTheme& layoutTheme = LayoutTheme::theme();
@@ skipping 97 matching lines @@
 
     if (event->type() == EventTypeNames::mousedown && event->isMouseEvent() && toMouseEvent(event)->button() == LeftButton) {
         InputDeviceCapabilities* sourceCapabilities = toMouseEvent(event)->fromTouch() ? InputDeviceCapabilities::firesTouchEventsSourceCapabilities() : InputDeviceCapabilities::doesntFireTouchEventsSourceCapabilities();
         focus(FocusParams(SelectionBehaviorOnFocus::Restore, WebFocusTypeNone, sourceCapabilities));
         if (layoutObject() && layoutObject()->isMenuList() && !isDisabledFormControl()) {
             if (popupIsVisible()) {
                 hidePopup();
             } else {
                 // Save the selection so it can be compared to the new selection
                 // when we call onChange during selectOption, which gets called
-                // from valueChanged, which gets called after the user makes a
-                // selection from the menu.
+                // from selectOptionByPopup, which gets called after the user
+                // makes a selection from the menu.
                 saveLastSelection();
                 // TODO(lanwei): Will check if we need to add
                 // InputDeviceCapabilities here when select menu list gets
                 // focus, see https://crbug.com/476530.
                 showPopup();
             }
         }
         event->setDefaultHandled();
     }
 
@@ skipping 515 matching lines @@
         return toHTMLOptionElement(listItems()[m_indexToSelectOnCancel]);
     if (m_suggestedOption)
         return m_suggestedOption;
     // TODO(tkent): We should not call optionToBeShown() in multiple() case.
     if (multiple())
         return selectedOption();
     DCHECK_EQ(selectedOption(), m_lastOnChangeOption);
     return m_lastOnChangeOption;
 }
 
-void HTMLSelectElement::valueChanged(unsigned listIndex)
+void HTMLSelectElement::selectOptionByPopup(int listIndex)
 {
+    DCHECK(usesMenuList());
     // Check to ensure a page navigation has not occurred while the popup was
     // up.
     Document& doc = document();
     if (&doc != doc.frame()->document())
         return;
 
     setIndexToSelectOnCancel(-1);
     optionSelectedByUser(listToOptionIndex(listIndex), true);
 }
 
 void HTMLSelectElement::popupDidCancel()
 {
     if (m_indexToSelectOnCancel >= 0)
-        valueChanged(m_indexToSelectOnCancel);
+        selectOptionByPopup(m_indexToSelectOnCancel);
 }
 
 void HTMLSelectElement::provisionalSelectionChanged(unsigned listIndex)
 {
     setIndexToSelectOnCancel(listIndex);
 }
 
 void HTMLSelectElement::showPopup()
 {
     if (popupIsVisible())
@@ skipping 117 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink