SELECT: Store the suggested value by an HTMLOptionElement pointer instead of an index number.

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 73 matching lines @@
 static const unsigned maxListItems = INT_MAX;
 
 HTMLSelectElement::HTMLSelectElement(Document& document, HTMLFormElement* form)
     : HTMLFormControlElementWithState(selectTag, document, form)
     , m_typeAhead(this)
     , m_size(0)
     , m_lastOnChangeOption(nullptr)
     , m_multiple(false)
     , m_activeSelectionState(false)
     , m_shouldRecalcListItems(false)
-    , m_suggestedIndex(-1)
     , m_isAutofilledByPreview(false)
     , m_indexToSelectOnCancel(-1)
     , m_popupIsVisible(false)
 {
     setHasCustomStyleCallbacks();
 }
 
 HTMLSelectElement* HTMLSelectElement::create(Document& document)
 {
     HTMLSelectElement* select = new HTMLSelectElement(document, 0);
@@ skipping 189 matching lines @@
                 continue;
             if (toHTMLOptionElement(item)->value() == value)
                 break;
             optionIndex++;
         }
         if (optionIndex >= static_cast<int>(listItems().size()))
             optionIndex = -1;
     }
 
     int previousSelectedIndex = selectedIndex();
-    setSuggestedIndex(-1);
+    setSuggestedOption(nullptr);
     if (m_isAutofilledByPreview)
         setAutofilled(false);
     SelectOptionFlags flags = DeselectOtherOptions | MakeOptionDirty;
     if (sendEvents)
         flags |= DispatchInputAndChangeEvent;
     selectOption(optionIndex, flags);
 
     if (sendEvents && previousSelectedIndex != selectedIndex() && !usesMenuList())
         listBoxOnChange();
 }
 
 String HTMLSelectElement::suggestedValue() const
 {
-    const ListItems& items = listItems();
-    for (unsigned i = 0; i < items.size(); ++i) {
-        if (isHTMLOptionElement(items[i]) && m_suggestedIndex >= 0) {
-            if (i == static_cast<unsigned>(m_suggestedIndex))
-                return toHTMLOptionElement(items[i])->value();
-        }
-    }
-    return "";
+    return m_suggestedOption ? m_suggestedOption->value() : "";
 }
 
 void HTMLSelectElement::setSuggestedValue(const String& value)
 {
     if (value.isNull()) {
-        setSuggestedIndex(-1);
+        setSuggestedOption(nullptr);
         return;
     }
 
-    unsigned optionIndex = 0;
     for (auto& item : listItems()) {
         if (!isHTMLOptionElement(item))
             continue;
         if (toHTMLOptionElement(item)->value() == value) {
-            setSuggestedIndex(optionIndex);
+            setSuggestedOption(toHTMLOptionElement(item));
             m_isAutofilledByPreview = true;
             return;
         }
-        optionIndex++;
     }
 
-    setSuggestedIndex(-1);
+    setSuggestedOption(nullptr);
 }
 
 bool HTMLSelectElement::isPresentationAttribute(const QualifiedName& name) const
 {
     if (name == alignAttr) {
         // Don't map 'align' attribute. This matches what Firefox, Opera and IE do.
         // See http://bugs.webkit.org/show_bug.cgi?id=12072
         return false;
     }
 
@@ skipping 593 matching lines @@
     }
 
     return -1;
 }
 
 void HTMLSelectElement::setSelectedIndex(int index)
 {
     selectOption(index, DeselectOtherOptions | MakeOptionDirty);
 }
 
-int HTMLSelectElement::suggestedIndex() const
+void HTMLSelectElement::setSuggestedOption(HTMLOptionElement* option)
 {
-    return m_suggestedIndex;
-}
-
-void HTMLSelectElement::setSuggestedIndex(int suggestedIndex)
-{
-    m_suggestedIndex = suggestedIndex;
+    if (m_suggestedOption == option)
+        return;
+    m_suggestedOption = option;
 
     if (LayoutObject* layoutObject = this->layoutObject())  {
         layoutObject->updateFromElement();
-        scrollToOption(item(listToOptionIndex(suggestedIndex)));
+        scrollToOption(option);
     }
     if (popupIsVisible())
         m_popup->updateFromElement(PopupMenu::BySelectionChange);
 }
 
 void HTMLSelectElement::scrollToOption(HTMLOptionElement* option)
 {
     if (!option)
         return;
     if (usesMenuList())
@@ skipping 56 matching lines @@
     else if (!m_lastOnChangeOption)
         resetToDefaultSelection();
     if (m_lastOnChangeOption == &option)
         m_lastOnChangeOption.clear();
     if (m_optionToScrollTo == &option)
         m_optionToScrollTo.clear();
     if (m_activeSelectionAnchor == &option)
         m_activeSelectionAnchor.clear();
     if (m_activeSelectionEnd == &option)
         m_activeSelectionEnd.clear();
+    if (m_suggestedOption == &option)
+        setSuggestedOption(nullptr);
     if (option.selected())
         setAutofilled(false);
     setNeedsValidityCheck();
     m_lastOnChangeSelection.clear();
 }
 
 void HTMLSelectElement::optGroupInsertedOrRemoved(HTMLOptGroupElement& optgroup)
 {
     setRecalcListItems(optgroup);
     setNeedsValidityCheck();
@@ skipping 823 matching lines @@
     setOptionsChangedOnLayoutObject();
 }
 
 DEFINE_TRACE(HTMLSelectElement)
 {
     visitor->trace(m_listItems);
     visitor->trace(m_lastOnChangeOption);
     visitor->trace(m_activeSelectionAnchor);
     visitor->trace(m_activeSelectionEnd);
     visitor->trace(m_optionToScrollTo);
+    visitor->trace(m_suggestedOption);
     visitor->trace(m_popup);
     visitor->trace(m_popupUpdater);
     HTMLFormControlElementWithState::trace(visitor);
 }
 
 void HTMLSelectElement::didAddUserAgentShadowRoot(ShadowRoot& root)
 {
     HTMLContentElement* content = HTMLContentElement::create(document());
     content->setAttribute(selectAttr, "option,optgroup,hr");
     root.appendChild(content);
@@ skipping 76 matching lines @@
 {
     m_indexToSelectOnCancel = listIndex;
     if (layoutObject())
         layoutObject()->updateFromElement();
 }
 
 int HTMLSelectElement::optionIndexToBeShown() const
 {
     if (m_indexToSelectOnCancel >= 0)
         return listToOptionIndex(m_indexToSelectOnCancel);
-    if (suggestedIndex() >= 0)
-        return suggestedIndex();
+    if (m_suggestedOption)
+        return m_suggestedOption->index();
     return selectedIndex();
 }
 
 void HTMLSelectElement::valueChanged(unsigned listIndex)
 {
     // Check to ensure a page navigation has not occurred while the popup was
     // up.
     Document& doc = document();
     if (&doc != doc.frame()->document())
         return;
@@ skipping 136 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink