SELECT element: Remove HTMLSelectElement::optionToListIndex().

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 125 matching lines @@
     // "0 size()" happens when an attribute "size" is absent or an invalid size
     // attribute is specified.  In this case, the display size should be assumed
     // as the default.  The default display size is 1 for non-multiple select
     // elements, and 4 for multiple select elements.
     //
     // Finally, if size() == 0 and non-multiple, the display size can be assumed
     // as 1.
     if (multiple() || size() > 1)
         return false;
 
-    int listIndex = optionToListIndex(0);
-    ASSERT(listIndex >= 0);
-    if (listIndex < 0)
+    // TODO(tkent): This function is called in CSS selector matching. Using
+    // listItems() might have performance impact.
+    if (listItems().size() == 0 || !isHTMLOptionElement(listItems()[0]))
         return false;
-    return !listIndex && toHTMLOptionElement(listItems()[listIndex])->value().isEmpty();
+    return toHTMLOptionElement(listItems()[0])->value().isEmpty();
 }
 
 String HTMLSelectElement::validationMessage() const
 {
     if (!willValidate())
         return String();
     if (customError())
         return customValidationMessage();
     if (valueMissing())
         return locale().queryString(WebLocalizedString::ValidationValueMissingForSelect);
@@ skipping 73 matching lines @@
         beforeElement = options()->item(before.getAsLong());
     else
         beforeElement = nullptr;
 
     insertBefore(elementToInsert, beforeElement, exceptionState);
     setNeedsValidityCheck();
 }
 
 void HTMLSelectElement::remove(int optionIndex)
 {
-    int listIndex = optionToListIndex(optionIndex);
-    if (listIndex >= 0)
-        listItems()[listIndex]->remove(IGNORE_EXCEPTION);
+    if (HTMLOptionElement* option = item(optionIndex))
+        option->remove(IGNORE_EXCEPTION);
 }
 
 String HTMLSelectElement::value() const
 {
     if (HTMLOptionElement* option = selectedOption())
         return option->value();
     return "";
 }
 
 void HTMLSelectElement::setValue(const String &value, bool sendEvents)
@@ skipping 792 matching lines @@
             if (usesMenuList()) {
                 // didSelectOption() is O(N) because of HTMLOptionElement::index().
                 toLayoutMenuList(layoutObject)->didSelectOption(element);
             }
         }
     }
 
     notifyFormStateChanged();
 }
 
-int HTMLSelectElement::optionToListIndex(int optionIndex) const
-{
-    const ListItems& items = listItems();
-    int listSize = static_cast<int>(items.size());
-    if (optionIndex < 0 || optionIndex >= listSize)
-        return -1;
-
-    int optionIndex2 = -1;
-    for (int listIndex = 0; listIndex < listSize; ++listIndex) {
-        if (isHTMLOptionElement(*items[listIndex])) {
-            ++optionIndex2;
-            if (optionIndex2 == optionIndex)
-                return listIndex;
-        }
-    }
-
-    return -1;
-}
-
 void HTMLSelectElement::dispatchFocusEvent(Element* oldFocusedElement, WebFocusType type, InputDeviceCapabilities* sourceCapabilities)
 {
     // Save the selection so it can be compared to the new selection when
     // dispatching change events during blur event dispatch.
     if (usesMenuList())
         saveLastSelection();
     HTMLFormControlElementWithState::dispatchFocusEvent(oldFocusedElement, type, sourceCapabilities);
 }
 
 void HTMLSelectElement::dispatchBlurEvent(Element* newFocusedElement, WebFocusType type, InputDeviceCapabilities* sourceCapabilities)
@@ skipping 966 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink