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

Source/web/PopupListBox.h

 /*
  * 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 115 matching lines @@
     // PopupListBox methods
 
     bool handleMouseDownEvent(const PlatformMouseEvent&);
     bool handleMouseMoveEvent(const PlatformMouseEvent&);
     bool handleMouseReleaseEvent(const PlatformMouseEvent&);
     bool handleWheelEvent(const PlatformWheelEvent&);
     bool handleKeyEvent(const PlatformKeyboardEvent&);
     bool handleTouchEvent(const PlatformTouchEvent&);
     bool handleGestureEvent(const PlatformGestureEvent&);
 
-    // Closes the popup
-    void abandon();
+    // Closes the popup without accepting a selection.
+    void cancel();
 
     // Updates our internal list to match the client.
     void updateFromElement();
 
-    // Sets the index of the option that is displayed in the <select> widget in the page
-    void setOriginalIndex(int);
+    // Sets the index of the option that is displayed in the popup.
+    void setSelectedIndex(int index) { m_selectedIndex = index; }
 
     // Gets the index of the item that the user is currently moused over or has
-    // selected with the keyboard. This is not the same as the original index,
+    // selected with the keyboard. This is not the same as the element value,
     // since the user has not yet accepted this input.
     int selectedIndex() const { return m_selectedIndex; }
 
     // Moves selection down/up the given number of items, scrolling if necessary.
     // Positive is down. The resulting index will be clamped to the range
     // [0, numItems), and non-option items will be skipped.
     void adjustSelectedIndex(int delta);
 
     // Returns the number of items in the list.
     int numItems() const { return static_cast<int>(m_items.size()); }
@@ skipping 28 matching lines @@
 protected:
     virtual void invalidateScrollCornerRect(const IntRect&) override { }
 
 private:
     friend class PopupContainer;
     friend class RefCounted<PopupListBox>;
 
     PopupListBox(PopupMenuClient*, bool deviceSupportsTouch, PopupContainer*);
     virtual ~PopupListBox();
 
-    // Hides the popup. Other classes should not call this. Use abandon instead.
+    // Hides the popup. Other classes should not call this. Use cancel instead.
     void hidePopup();
 
     // Returns true if the selection can be changed to index.
     // Disabled items, or labels cannot be selected.
     bool isSelectableItem(int index);
 
     // Select an index in the list, scrolling if necessary.
     void selectIndex(int index);
 
     // Accepts the selected index as the value to be displayed in the <select>
@@ skipping 42 matching lines @@
     IntRect contentsToWindow(const IntRect&) const;
     void setContentsSize(const IntSize&);
     void adjustScrollbarExistence();
     void updateScrollbarGeometry();
     IntRect windowClipRect() const;
 
     // If the device is a touch screen we increase the height of menu items
     // to make it easier to unambiguously touch them.
     bool m_deviceSupportsTouch;
 
-    // This is the index of the item marked as "selected" - i.e. displayed in
-    // the widget on the page.
-    int m_originalIndex;
-
     // This is the index of the item that the user is hovered over or has
     // selected using the keyboard in the list. They have not confirmed this
     // selection by clicking or pressing enter yet however.
     int m_selectedIndex;
 
-    // If >= 0, this is the index we should accept if the popup is "abandoned".
-    // This is used for keyboard navigation, where we want the
-    // selection to change immediately, and is only used if the settings
-    // acceptOnAbandon field is true.
-    int m_acceptedIndexOnAbandon;
-
     // This is the number of rows visible in the popup. The maximum number
     // visible at a time is defined as being kMaxVisibleRows. For a scrolled
     // popup, this can be thought of as the page size in data units.
     int m_visibleRows;
 
     // Our suggested width, not including scrollbar.
     int m_baseWidth;
 
     // The maximum height we can be without being off-screen.
     int m_maxHeight;
@@ skipping 32 matching lines @@
     RawPtrWillBeMember<PopupContainer> m_container;
 
     RefPtrWillBeMember<Scrollbar> m_verticalScrollbar;
     IntSize m_contentsSize;
     IntPoint m_scrollOffset;
 };
 
 } // namespace blink
 
 #endif