Merge "SELECT element: Commit a provisional OPTION selection on blur." to M56

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.
@@ skipping 312 matching lines @@
         lazyReattachIfAttached();
       resetToDefaultSelection();
       if (!usesMenuList())
         saveListboxActiveSelection();
     }
   } else if (name == multipleAttr) {
     parseMultipleAttribute(value);
   } else if (name == accesskeyAttr) {
     // FIXME: ignore for the moment.
     //
-  } else if (name == disabledAttr) {
-    HTMLFormControlElementWithState::parseAttribute(name, oldValue, value);
-    if (popupIsVisible())
-      hidePopup();
-
   } else {
     HTMLFormControlElementWithState::parseAttribute(name, oldValue, value);
   }
 }
 
 bool HTMLSelectElement::shouldShowFocusRingOnMouseFocus() const {
   return true;
 }
 
 bool HTMLSelectElement::canSelectAll() const {
@@ skipping 723 matching lines @@
     Element* newFocusedElement,
     WebFocusType type,
     InputDeviceCapabilities* sourceCapabilities) {
   m_typeAhead.resetSession();
   // We only need to fire change events here for menu lists, because we fire
   // change events for list boxes whenever the selection change is actually
   // made.  This matches other browsers' behavior.
   if (usesMenuList())
     dispatchInputAndChangeEventForMenuList();
   m_lastOnChangeSelection.clear();
+  if (popupIsVisible())
+    hidePopup();
   HTMLFormControlElementWithState::dispatchBlurEvent(newFocusedElement, type,
                                                      sourceCapabilities);
 }
 
 void HTMLSelectElement::deselectItemsWithoutValidation(
     HTMLOptionElement* excludeElement) {
   if (!isMultiple() && usesMenuList() && m_lastOnChangeOption &&
       m_lastOnChangeOption != excludeElement) {
     m_lastOnChangeOption->setSelectedState(false);
     return;
@@ skipping 273 matching lines @@
         // makes a selection from the menu.
         saveLastSelection();
         // TODO(lanwei): Will check if we need to add
         // InputDeviceCapabilities here when select menu list gets
         // focus, see https://crbug.com/476530.
         showPopup();
       }
     }
     event->setDefaultHandled();
   }
-
-  if (event->type() == EventTypeNames::blur) {
-    if (popupIsVisible())
-      hidePopup();
-  }
 }
 
 void HTMLSelectElement::updateSelectedState(HTMLOptionElement* clickedOption,
                                             bool multi,
                                             bool shift) {
   DCHECK(clickedOption);
   // Save the selection so it can be compared to the new selection when
   // dispatching change events during mouseup, or after autoscroll finishes.
   saveLastSelection();
 
@@ skipping 642 matching lines @@
   m_popupUpdater = nullptr;
 }
 
 void HTMLSelectElement::didMutateSubtree() {
   DCHECK(popupIsVisible());
   DCHECK(m_popup);
   m_popup->updateFromElement(PopupMenu::ByDOMChange);
 }
 
 }  // namespace blink