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

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

Index: third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
index 9cb94478f0dbf20b4a3373cde5fa07bc6e09c7b4..d255023df57cddc4515bb4414192e9978f00cb59 100644
--- a/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLSelectElement.cpp
@@ -330,11 +330,6 @@ void HTMLSelectElement::parseAttribute(const QualifiedName& name,
   } 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);
   }
@@ -1078,6 +1073,8 @@ void HTMLSelectElement::dispatchBlurEvent(
   if (usesMenuList())
     dispatchInputAndChangeEventForMenuList();
   m_lastOnChangeSelection.clear();
+  if (popupIsVisible())
+    hidePopup();
   HTMLFormControlElementWithState::dispatchBlurEvent(newFocusedElement, type,
                                                      sourceCapabilities);
 }
@@ -1371,11 +1368,6 @@ void HTMLSelectElement::menuListDefaultEventHandler(Event* event) {
     }
     event->setDefaultHandled();
   }
-
-  if (event->type() == EventTypeNames::blur) {
-    if (popupIsVisible())
-      hidePopup();
-  }
 }
 
 void HTMLSelectElement::updateSelectedState(HTMLOptionElement* clickedOption,