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 57 matching lines @@
 
 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 158 matching lines @@
             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);

[Xianzhu, 2015/03/18 16:46:22]

Can we have a better name for the method? The current name looks confusing.

[keishi, 2015/03/30 22:20:52]

Seemed to be barely used so I removed m_originalIndex.

-        m_popupClient->setTextFromItem(m_selectedIndex);
+        m_popupClient->setProvisionallySelectedListIndex(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();
         // Return false so the TAB key event is propagated to the page.
         return false;
     }
 
     return true;
 }
 
 HostWindow* PopupListBox::hostWindow() const
 {
@@ skipping 213 matching lines @@
     return itemFont;
 }
 
 void PopupListBox::abandon()
 {
     RefPtrWillBeRawPtr<PopupListBox> protect(this);
 
     m_selectedIndex = m_originalIndex;
 
     hidePopup();
-
-    if (m_acceptedIndexOnAbandon >= 0) {
-        if (m_popupClient)
-            m_popupClient->valueChanged(m_acceptedIndexOnAbandon);
-        m_acceptedIndexOnAbandon = -1;
-    }
 }
 
 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 502 matching lines @@
     maximumOffset.clampNegativeToZero();
     return maximumOffset;
 }
 
 IntPoint PopupListBox::minimumScrollPosition() const
 {
     return IntPoint(-scrollOrigin().x(), -scrollOrigin().y());
 }
 
 } // namespace blink