Remove HTMLSelectElement::optionSelectedByUser().

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 105 matching lines @@
 {
 }
 
 const AtomicString& HTMLSelectElement::formControlType() const
 {
     DEFINE_STATIC_LOCAL(const AtomicString, selectMultiple, ("select-multiple"));
     DEFINE_STATIC_LOCAL(const AtomicString, selectOne, ("select-one"));
     return m_multiple ? selectMultiple : selectOne;
 }
 
-void HTMLSelectElement::optionSelectedByUser(int optionIndex, bool fireOnChangeNow)
-{
-    // User interaction such as mousedown events can cause list box select
-    // elements to send change events.  This produces that same behavior for
-    // changes triggered by other code running on behalf of the user.
-    if (!usesMenuList()) {
-        updateSelectedState(item(optionIndex), false, false);
-        setNeedsValidityCheck();
-        if (fireOnChangeNow)
-            listBoxOnChange();
-        return;
-    }
-
-    // Bail out if this index is already the selected one, to avoid running
-    // unnecessary JavaScript that can mess up autofill when there is no actual
-    // change (see https://bugs.webkit.org/show_bug.cgi?id=35256 and
-    // <rdar://7467917>).  The selectOption function does not behave this way,
-    // possibly because other callers need a change event even in cases where
-    // the selected option is not change.
-    if (optionIndex == selectedIndex())
-        return;
-
-    selectOption(item(optionIndex), DeselectOtherOptions | MakeOptionDirty | (fireOnChangeNow ? DispatchInputAndChangeEvent : 0));
-}
-
 bool HTMLSelectElement::hasPlaceholderLabelOption() const
 {
     // The select element has no placeholder label option if it has an attribute
     // "multiple" specified or a display size of non-1.
     //
     // The condition "size() > 1" is not compliant with the HTML5 spec as of Dec
     // 3, 2010. "size() != 1" is correct.  Using "size() > 1" here because
     // size() may be 0 in WebKit.  See the discussion at
     // https://bugs.webkit.org/show_bug.cgi?id=43887
     //
@@ skipping 1766 matching lines @@
 void HTMLSelectElement::selectOptionByPopup(int listIndex)
 {
     DCHECK(usesMenuList());
     // Check to ensure a page navigation has not occurred while the popup was
     // up.
     Document& doc = document();
     if (&doc != doc.frame()->document())
         return;
 
     setIndexToSelectOnCancel(-1);
-    optionSelectedByUser(listToOptionIndex(listIndex), true);
+
+    HTMLOptionElement* option = nullptr;
+    if (listIndex >= 0 && isHTMLOptionElement(listItems()[listIndex]))
+        option = toHTMLOptionElement(listItems()[listIndex]);
+    // Bail out if this index is already the selected one, to avoid running
+    // unnecessary JavaScript that can mess up autofill when there is no actual
+    // change (see https://bugs.webkit.org/show_bug.cgi?id=35256 and
+    // <rdar://7467917>).  The selectOption function does not behave this way,
+    // possibly because other callers need a change event even in cases where
+    // the selected option is not change.
+    if (option == selectedOption())
+        return;
+    selectOption(option, DeselectOtherOptions | MakeOptionDirty | DispatchInputAndChangeEvent);
 }
 
 void HTMLSelectElement::popupDidCancel()
 {
     if (m_indexToSelectOnCancel >= 0)
         selectOptionByPopup(m_indexToSelectOnCancel);
 }
 
 void HTMLSelectElement::provisionalSelectionChanged(unsigned listIndex)
 {
@@ skipping 123 matching lines @@
 }
 
 void HTMLSelectElement::didMutateSubtree()
 {
     DCHECK(popupIsVisible());
     DCHECK(m_popup);
     m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 } // namespace blink