SELECT element: Avoid to use listItems() in HTMLSelectElement::selectOption()

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

 /*
  * 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) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 75 matching lines @@
 
     // |options| and |selectedOptions| are not safe to be used in in
     // HTMLOptionElement::removedFrom() and insertedInto() because their cache
     // is inconsistent in these functions.
     HTMLOptionsCollection* options();
     HTMLCollection* selectedOptions();
 
     // This is similar to |options| HTMLCollection.  But this is safe in
     // HTMLOptionElement::removedFrom() and insertedInto().
     // OptionList supports only forward iteration.
-    OptionList optionList() { return OptionList(*this); }
+    OptionList optionList() const { return OptionList(*this); }
 
     void optionElementChildrenChanged(const HTMLOptionElement&);
 
     void invalidateSelectedItems();
 
     using ListItems = HeapVector<Member<HTMLElement>>;
     // We prefer |optionList()| to |listItems()|.
     const ListItems& listItems() const;
 
     void accessKeyAction(bool sendMouseEvents) override;
@@ skipping 90 matching lines @@
     LayoutObject* createLayoutObject(const ComputedStyle&) override;
     void didRecalcStyle(StyleRecalcChange) override;
     void detach(const AttachContext& = AttachContext()) override;
     void appendToFormData(FormData&) override;
     void didAddUserAgentShadowRoot(ShadowRoot&) override;
 
     void defaultEventHandler(Event*) override;
 
     void dispatchInputAndChangeEventForMenuList();
 
-    // |subject| is an element which was inserted or removed.
-    void setRecalcListItems(HTMLElement& subject);
+    void setRecalcListItems();
     void recalcListItems() const;
     enum ResetReason {
         ResetReasonSelectedOptionRemoved,
         ResetReasonOthers
     };
     void resetToDefaultSelection(ResetReason = ResetReasonOthers);
     void typeAheadFind(KeyboardEvent*);
     void saveLastSelection();
     void saveListboxActiveSelection();
     // Returns the first selected OPTION, or nullptr.
     HTMLOptionElement* selectedOption() const;
 
     bool isOptionalFormControl() const override { return !isRequiredFormControl(); }
     bool isRequiredFormControl() const override;
 
     bool hasPlaceholderLabelOption() const;
 
     enum SelectOptionFlag {
         DeselectOtherOptions = 1 << 0,
         DispatchInputAndChangeEvent = 1 << 1,
         MakeOptionDirty = 1 << 2,
     };
     typedef unsigned SelectOptionFlags;
     void selectOption(HTMLOptionElement*, SelectOptionFlags);
-    void deselectItemsWithoutValidation(HTMLElement* elementToExclude = 0);
+    void deselectItemsWithoutValidation(HTMLOptionElement* elementToExclude = nullptr);
     void parseMultipleAttribute(const AtomicString&);
     HTMLOptionElement* lastSelectedOption() const;
     void updateSelectedState(HTMLOptionElement*, bool multi, bool shift);
     void menuListDefaultEventHandler(Event*);
     void handlePopupOpenKeyboardEvent(Event*);
     bool shouldOpenPopupForKeyDownEvent(KeyboardEvent*);
     bool shouldOpenPopupForKeyPressEvent(KeyboardEvent*);
     void listBoxDefaultEventHandler(Event*);
     void setOptionsChangedOnLayoutObject();
     size_t searchOptionsForValue(const String&, size_t listIndexStart, size_t listIndexEnd) const;
@@ skipping 51 matching lines @@
 
     FRIEND_TEST_ALL_PREFIXES(HTMLSelectElementTest, FirstSelectableOption);
     FRIEND_TEST_ALL_PREFIXES(HTMLSelectElementTest, LastSelectableOption);
     FRIEND_TEST_ALL_PREFIXES(HTMLSelectElementTest, NextSelectableOption);
     FRIEND_TEST_ALL_PREFIXES(HTMLSelectElementTest, PreviousSelectableOption);
 };
 
 } // namespace blink
 
 #endif // HTMLSelectElement_h