Fix issue on <select> style change when popup is visible

Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
@@ skipping 51 matching lines @@
 
 PassRefPtrWillBeRawPtr<PopupMenuImpl> PopupMenuImpl::create(ChromeClientImpl* chromeClient, PopupMenuClient* client)
 {
     return adoptRefWillBeNoop(new PopupMenuImpl(chromeClient, client));
 }
 
 PopupMenuImpl::PopupMenuImpl(ChromeClientImpl* chromeClient, PopupMenuClient* client)
     : m_chromeClient(chromeClient)
     , m_client(client)
     , m_popup(nullptr)
-    , m_indexToSetOnClose(-1)
     , m_needsUpdate(false)
 {
 }
 
 PopupMenuImpl::~PopupMenuImpl()
 {
     ASSERT(!m_popup);
 }
 
 IntSize PopupMenuImpl::contentSize()
@@ skipping 150 matching lines @@
 void PopupMenuImpl::setValueAndClosePopup(int numValue, const String& stringValue)
 {
     ASSERT(m_popup);
     ASSERT(m_client);
     RefPtrWillBeRawPtr<PopupMenuImpl> protector(this);
     bool success;
     int listIndex = stringValue.toInt(&success);
     ASSERT(success);
     m_client->selectionChanged(listIndex);
     m_client->valueChanged(listIndex);
-    m_indexToSetOnClose = -1;
-    closePopup();
+    if (m_popup)
+        m_chromeClient->closePagePopup(m_popup);
 }
 
 void PopupMenuImpl::setValue(const String& value)
 {
     ASSERT(m_client);
     bool success;
     int listIndex = value.toInt(&success);
     ASSERT(success);
-    m_client->setTextFromItem(listIndex);
-    m_indexToSetOnClose = listIndex;
+    m_client->provisionalSelectionChanged(listIndex);
 }
 
 void PopupMenuImpl::didClosePopup()
 {
     // Clearing m_popup first to prevent from trying to close the popup again.
     m_popup = nullptr;
     RefPtrWillBeRawPtr<PopupMenuImpl> protector(this);
-    if (m_client && m_indexToSetOnClose >= 0) {
-        // valueChanged() will dispatch a 'change' event.
-        m_client->valueChanged(m_indexToSetOnClose);
-    }
-    m_indexToSetOnClose = -1;
     if (m_client)
         m_client->popupDidHide();
 }
 
 Element& PopupMenuImpl::ownerElement()
 {
     return m_client->ownerElement();
 }
 
 Locale& PopupMenuImpl::locale()
 {
     return Locale::defaultLocale();
 }
 
 void PopupMenuImpl::closePopup()
 {
     if (m_popup)
         m_chromeClient->closePagePopup(m_popup);
+    if (m_client)
+        m_client->popupDidCancel();
+}
+
+void PopupMenuImpl::dispose()
+{
+    if (m_popup)
+        m_chromeClient->closePagePopup(m_popup);
 }
 
-void PopupMenuImpl::dispose()
-{
-    closePopup();
-}
-
 void PopupMenuImpl::show(const FloatQuad& /*controlPosition*/, const IntSize& /*controlSize*/, int /*index*/)
 {
     ASSERT(!m_popup);
     m_popup = m_chromeClient->openPagePopup(this);
 }
 
 void PopupMenuImpl::hide()
 {
     if (m_popup)
         m_chromeClient->closePagePopup(m_popup);
@@ skipping 35 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_client = nullptr;
     // Cannot be done during finalization, so instead done when the
     // render object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink