SELECT element: Add HTMLSelectElement::selectedListIndex().

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 855 matching lines @@
     }
 
     return -1;
 }
 
 void HTMLSelectElement::setSelectedIndex(int index)
 {
     selectOption(item(index), DeselectOtherOptions | MakeOptionDirty);
 }
 
+int HTMLSelectElement::selectedListIndex() const
+{
+    int index = 0;
+    for (const auto& item : listItems()) {
+        if (isHTMLOptionElement(item) && toHTMLOptionElement(item)->selected())
+            return index;
+        ++index;
+    }
+    return -1;
+}
+
 void HTMLSelectElement::setSuggestedOption(HTMLOptionElement* option)
 {
     if (m_suggestedOption == option)
         return;
     m_suggestedOption = option;
 
     if (LayoutObject* layoutObject = this->layoutObject())  {
         layoutObject->updateFromElement();
         scrollToOption(option);
     }
@@ skipping 800 matching lines @@
         if (HTMLOptionElement* option = optionAtListIndex(--i)) {
             if (option->selected())
                 return option;
         }
     }
     return nullptr;
 }
 
 int HTMLSelectElement::indexOfSelectedOption() const
 {
-    return optionToListIndex(selectedIndex());
+    return selectedListIndex();
 }
 
 int HTMLSelectElement::optionCount() const
 {
     return listItems().size();
 }
 
 String HTMLSelectElement::optionAtIndex(int index) const
 {
     if (HTMLOptionElement* option = optionAtListIndex(index)) {
@@ skipping 356 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink