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

Source/core/layout/LayoutMenuList.cpp

 /*
  * This file is part of the select element renderer in WebCore.
  *
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *               2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 41 matching lines @@
 using namespace HTMLNames;
 
 LayoutMenuList::LayoutMenuList(Element* element)
     : LayoutFlexibleBox(element)
     , m_buttonText(nullptr)
     , m_innerBlock(nullptr)
     , m_optionsChanged(true)
     , m_optionsWidth(0)
     , m_lastActiveIndex(-1)
     , m_popupIsVisible(false)
+    , m_indexToSelectOnCancel(-1)
 {
     ASSERT(isHTMLSelectElement(element));
 }
 
 LayoutMenuList::~LayoutMenuList()
 {
     ASSERT(!m_popup);
 }
 
 void LayoutMenuList::destroy()
@@ skipping 131 matching lines @@
 void LayoutMenuList::updateFromElement()
 {
     if (m_optionsChanged) {
         updateOptionsWidth();
         m_optionsChanged = false;
     }
 
     if (m_popupIsVisible)
         m_popup->updateFromElement();
 
-    if (selectElement()->suggestedIndex() >= 0)
+    if (m_indexToSelectOnCancel >= 0)
+        setTextFromOption(selectElement()->listToOptionIndex(m_indexToSelectOnCancel));
+    else if (selectElement()->suggestedIndex() >= 0)
         setTextFromOption(selectElement()->suggestedIndex());
     else
         setTextFromOption(selectElement()->selectedIndex());
 }
 
 void LayoutMenuList::setTextFromOption(int optionIndex)
 {
     HTMLSelectElement* select = selectElement();
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = select->listItems();
     const int size = listItems.size();
@@ skipping 348 matching lines @@
     return select->optionToListIndex(select->selectedIndex());
 }
 
 void LayoutMenuList::popupDidHide()
 {
     m_popupIsVisible = false;
     if (AXObjectCache* cache = document().existingAXObjectCache())
         cache->didHideMenuListPopup(this);
 }
 
+void LayoutMenuList::popupDidCancel()
+{
+    if (m_indexToSelectOnCancel >= 0) {
+        valueChanged(m_indexToSelectOnCancel);
+        m_indexToSelectOnCancel = -1;
+    }
+}
+
 bool LayoutMenuList::itemIsSeparator(unsigned listIndex) const
 {
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = selectElement()->listItems();
     return listIndex < listItems.size() && isHTMLHRElement(*listItems[listIndex]);
 }
 
 bool LayoutMenuList::itemIsLabel(unsigned listIndex) const
 {
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = selectElement()->listItems();
     return listIndex < listItems.size() && isHTMLOptGroupElement(*listItems[listIndex]);
 }
 
 bool LayoutMenuList::itemIsSelected(unsigned listIndex) const
 {
     const WillBeHeapVector<RawPtrWillBeMember<HTMLElement>>& listItems = selectElement()->listItems();
     if (listIndex >= listItems.size())
         return false;
     HTMLElement* element = listItems[listIndex];
     return isHTMLOptionElement(*element) && toHTMLOptionElement(*element).selected();
 }
 
-void LayoutMenuList::setTextFromItem(unsigned listIndex)
+void LayoutMenuList::provisionalSelectionChanged(unsigned listIndex)
 {
-    setTextFromOption(selectElement()->listToOptionIndex(listIndex));
+    m_indexToSelectOnCancel = listIndex;
+    setTextFromOption(selectElement()->listToOptionIndex(m_indexToSelectOnCancel));
 }
 
 } // namespace blink