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

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 36 matching lines @@
 
 class CORE_EXPORT HTMLSelectElement final : public HTMLFormControlElementWithState, private TypeAheadDataSource {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static HTMLSelectElement* create(Document&);
     static HTMLSelectElement* create(Document&, HTMLFormElement*);
     ~HTMLSelectElement() override;
 
     int selectedIndex() const;
     void setSelectedIndex(int);
-    int suggestedIndex() const;
-    void setSuggestedIndex(int);
 
     void optionSelectedByUser(int index, bool dispatchChangeEvent, bool allowMultipleSelection = false);
 
     // For ValidityState
     String validationMessage() const override;
     bool valueMissing() const override;
 
     String defaultToolTip() const override;
     void resetImpl() override;
 
@@ skipping 161 matching lines @@
     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;
     void updateListBoxSelection(bool deselectOtherOptions, bool scroll = true);
     void setIndexToSelectOnCancel(int listIndex);
+    void setSuggestedOption(HTMLOptionElement*);
 
     enum SkipDirection {
         SkipBackwards = -1,
         SkipForwards = 1
     };
     HTMLOptionElement* nextValidOption(int listIndex, SkipDirection, int skip) const;
     HTMLOptionElement* nextSelectableOption(HTMLOptionElement*) const;
     HTMLOptionElement* previousSelectableOption(HTMLOptionElement*) const;
     HTMLOptionElement* firstSelectableOption() const;
     HTMLOptionElement* lastSelectableOption() const;
@@ skipping 17 matching lines @@
     // HTMLHRElement objects.
     mutable ListItems m_listItems;
     Vector<bool> m_lastOnChangeSelection;
     Vector<bool> m_cachedStateForActiveSelection;
     TypeAhead m_typeAhead;
     unsigned m_size;
     Member<HTMLOptionElement> m_lastOnChangeOption;
     Member<HTMLOptionElement> m_activeSelectionAnchor;
     Member<HTMLOptionElement> m_activeSelectionEnd;
     Member<HTMLOptionElement> m_optionToScrollTo;
+    Member<HTMLOptionElement> m_suggestedOption;
     bool m_multiple;
     bool m_activeSelectionState;
     mutable bool m_shouldRecalcListItems;
-    int m_suggestedIndex;
     bool m_isAutofilledByPreview;
 
     class PopupUpdater;
     Member<PopupUpdater> m_popupUpdater;
     Member<PopupMenu> m_popup;
     int m_indexToSelectOnCancel;
     bool m_popupIsVisible;
 
     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