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

Source/web/PopupListBox.cpp

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 55 matching lines @@
 
 using namespace WTF::Unicode;
 
 const int PopupListBox::defaultMaxHeight = 500;
 static const int maxVisibleRows = 20;
 static const int minEndOfLinePadding = 2;
 static const TimeStamp typeAheadTimeoutMs = 1000;
 
 PopupListBox::PopupListBox(PopupMenuClient* client, bool deviceSupportsTouch, PopupContainer* container)
     : m_deviceSupportsTouch(deviceSupportsTouch)
-    , m_originalIndex(0)
     , m_selectedIndex(0)
-    , m_acceptedIndexOnAbandon(-1)
     , m_visibleRows(0)
     , m_baseWidth(0)
     , m_maxHeight(defaultMaxHeight)
     , m_popupClient(client)
     , m_repeatingChar(0)
     , m_lastCharTime(0)
     , m_maxWindowWidth(std::numeric_limits<int>::max())
     , m_container(container)
 {
 }
@@ skipping 21 matching lines @@
 bool PopupListBox::handleMouseDownEvent(const PlatformMouseEvent& event)
 {
     Scrollbar* scrollbar = scrollbarAtRootFramePoint(event.position());
     if (scrollbar) {
         m_capturingScrollbar = scrollbar;
         m_capturingScrollbar->mouseDown(event);
         return true;
     }
 
     if (!isPointInBounds(event.position()))
-        abandon();
+        cancel();
 
     return true;
 }
 
 bool PopupListBox::handleMouseMoveEvent(const PlatformMouseEvent& event)
 {
     if (m_capturingScrollbar) {
         m_capturingScrollbar->mouseMoved(event);
         return true;
     }
@@ skipping 37 matching lines @@
         // which is called before dispatchMouseEvent() is called.
         m_focusedElement = nullptr;
     }
 
     return true;
 }
 
 bool PopupListBox::handleWheelEvent(const PlatformWheelEvent& event)
 {
     if (!isPointInBounds(event.position())) {
-        abandon();
+        cancel();
         return true;
     }
 
     ScrollableArea::handleWheelEvent(event);
     return true;
 }
 
 bool PopupListBox::handleTouchEvent(const PlatformTouchEvent&)
 {
     return false;
@@ skipping 16 matching lines @@
 bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event)
 {
     if (event.type() == PlatformEvent::KeyUp)
         return true;
 
     if (!numItems() && event.windowsVirtualKeyCode() != VKEY_ESCAPE)
         return true;
 
     switch (event.windowsVirtualKeyCode()) {
     case VKEY_ESCAPE:
-        abandon(); // may delete this
+        cancel(); // may delete this
         return true;
     case VKEY_RETURN:
         if (m_selectedIndex == -1)  {
             hidePopup();
             // Don't eat the enter if nothing is selected.
             return false;
         }
         acceptIndex(m_selectedIndex); // may delete this
         return true;
     case VKEY_UP:
@@ skipping 20 matching lines @@
             && isCharacterTypeEvent(event))
             typeAheadFind(event);
         break;
     }
 
     if (event.altKey() && (event.keyIdentifier() == "Down" || event.keyIdentifier() == "Up")) {
         hidePopup();
         return true;
     }
 
-    if (m_originalIndex != m_selectedIndex) {
-        // Keyboard events should update the selection immediately (but we don't
-        // want to fire the onchange event until the popup is closed, to match
-        // IE). We change the original index so we revert to that when the
-        // popup is closed.
-        m_acceptedIndexOnAbandon = m_selectedIndex;
-
-        setOriginalIndex(m_selectedIndex);
-        m_popupClient->setTextFromItem(m_selectedIndex);
-    }
+    m_popupClient->provisionalSelectionChanged(m_selectedIndex);
     if (event.windowsVirtualKeyCode() == VKEY_TAB) {
         // TAB is a special case as it should select the current item if any and
         // advance focus.
         if (m_selectedIndex >= 0) {
             acceptIndex(m_selectedIndex); // May delete us.
             // Return false so the TAB key event is propagated to the page.
             return false;
         }
-        // Call abandon() so we honor m_acceptedIndexOnAbandon if set.
-        abandon();
+        cancel();
         // Return false so the TAB key event is propagated to the page.
         return false;
     }
 
     return true;
 }
 
 HostWindow* PopupListBox::hostWindow() const
 {
     // Our parent is the root FrameView, so it is the one that has a
@@ skipping 205 matching lines @@
         FontDescription d = itemFont.fontDescription();
         d.setWeight(FontWeightBold);
         Font font(d);
         font.update(nullptr);
         return font;
     }
 
     return itemFont;
 }
 
-void PopupListBox::abandon()
+void PopupListBox::cancel()
 {
     RefPtrWillBeRawPtr<PopupListBox> protect(this);
 
-    m_selectedIndex = m_originalIndex;
-
     hidePopup();
 
-    if (m_acceptedIndexOnAbandon >= 0) {
-        if (m_popupClient)
-            m_popupClient->valueChanged(m_acceptedIndexOnAbandon);
-        m_acceptedIndexOnAbandon = -1;
-    }
+    if (m_popupClient)
+        m_popupClient->popupDidCancel();
 }
 
 int PopupListBox::pointToRowIndex(const IntPoint& point)
 {
     int y = scrollY() + point.y();
 
     // FIXME: binary search if perf matters.
     for (int i = 0; i < numItems(); ++i) {
         if (y < m_items[i]->yOffset)
             return i-1;
     }
 
     // Last item?
     if (y < contentsSize().height())
         return m_items.size()-1;
 
     return -1;
 }
 
 bool PopupListBox::acceptIndex(int index)
 {
-    // Clear m_acceptedIndexOnAbandon once user accepts the selected index.
-    if (m_acceptedIndexOnAbandon >= 0)
-        m_acceptedIndexOnAbandon = -1;
-
     if (index >= numItems())
         return false;
 
     if (index < 0) {
         if (m_popupClient) {
             // Enter pressed with no selection, just close the popup.
             hidePopup();
         }
         return false;
     }
@@ skipping 23 matching lines @@
         invalidateRow(m_selectedIndex);
         m_selectedIndex = index;
         invalidateRow(m_selectedIndex);
 
         scrollToRevealSelection();
         m_popupClient->selectionChanged(m_selectedIndex);
     } else if (!isSelectable)
         clearSelection();
 }
 
-void PopupListBox::setOriginalIndex(int index)
-{
-    m_originalIndex = m_selectedIndex = index;
-}
-
 int PopupListBox::getRowHeight(int index) const
 {
     int minimumHeight = m_deviceSupportsTouch ? optionRowHeightForTouch : minRowHeight;
 
     if (index < 0 || m_popupClient->itemStyle(index).isDisplayNone())
         return minimumHeight;
 
     // Separator row height is the same size as itself.
     if (m_popupClient->itemIsSeparator(index))
         return max(separatorHeight, minimumHeight);
@@ skipping 129 matching lines @@
         else
             type = PopupItem::TypeOption;
         m_items.append(adoptPtr(new PopupItem(m_popupClient->itemText(i), type)));
         m_items[i]->enabled = isSelectableItem(i);
         PopupMenuStyle style = m_popupClient->itemStyle(i);
         m_items[i]->textDirection = style.textDirection();
         m_items[i]->hasTextDirectionOverride = style.hasTextDirectionOverride();
         m_items[i]->displayNone = style.isDisplayNone();
     }
 
-    if (m_originalIndex != m_popupClient->selectedIndex() || m_selectedIndex >= static_cast<int>(m_items.size()))
-        setOriginalIndex(m_popupClient->selectedIndex());
+    if (m_selectedIndex >= static_cast<int>(m_items.size()))
+        m_selectedIndex = m_popupClient->selectedIndex();
 
     layout();
 }
 
 void PopupListBox::setMaxWidthAndLayout(int maxWidth)
 {
     m_maxWindowWidth = maxWidth;
     layout();
 }
 
@@ skipping 303 matching lines @@
     maximumOffset.clampNegativeToZero();
     return maximumOffset;
 }
 
 IntPoint PopupListBox::minimumScrollPosition() const
 {
     return IntPoint(-scrollOrigin().x(), -scrollOrigin().y());
 }
 
 } // namespace blink