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

Source/web/PopupMenuTest.cpp

 /*
  * Copyright (C) 2010 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 61 matching lines @@
 #include <gtest/gtest.h>
 
 using namespace blink;
 using blink::URLTestHelpers::toKURL;
 
 namespace {
 
 class TestPopupMenuClient : public PopupMenuClient {
 public:
     // Item at index 0 is selected by default.
-    TestPopupMenuClient() : m_selectIndex(0), m_node(0), m_listSize(10) { }
+    TestPopupMenuClient() : m_selectIndex(0), m_node(0), m_listSize(10), m_indexToSelectOnCancel(-1) { }
     virtual ~TestPopupMenuClient() { }
     virtual void valueChanged(unsigned listIndex, bool fireEvents = true)
     {
         m_selectIndex = listIndex;
         if (m_node) {
             HTMLSelectElement* select = toHTMLSelectElement(m_node);
             select->optionSelectedByUser(select->listToOptionIndex(listIndex), fireEvents);
         }
     }
     virtual void selectionChanged(unsigned, bool) { }
@@ skipping 17 matching lines @@
         Font font(fontDescription);
         font.update(nullptr);
         return PopupMenuStyle(Color::black, Color::white, font, true, false, Length(), TextDirection(), false /* has text direction override */);
     }
     virtual PopupMenuStyle menuStyle() const { return itemStyle(0); }
     virtual LayoutUnit clientPaddingLeft() const { return 0; }
     virtual LayoutUnit clientPaddingRight() const { return 0; }
     virtual int listSize() const { return m_listSize; }
     virtual int selectedIndex() const { return m_selectIndex; }
     virtual void popupDidHide() { }
+    virtual void popupDidCancel()
+    {
+        if (m_indexToSelectOnCancel >= 0)
+            m_selectIndex = m_indexToSelectOnCancel;
+    }
     virtual bool itemIsSeparator(unsigned listIndex) const { return false; }
     virtual bool itemIsLabel(unsigned listIndex) const { return false; }
     virtual bool itemIsSelected(unsigned listIndex) const { return listIndex == m_selectIndex; }
-    virtual void setTextFromItem(unsigned listIndex) { }
+    virtual void provisionalSelectionChanged(unsigned listIndex) { m_indexToSelectOnCancel = listIndex; }
     virtual IntRect elementRectRelativeToViewport() const override { return IntRect(); }
     virtual Element& ownerElement() const override { return *toElement(m_node); }
     virtual ComputedStyle* computedStyleForItem(Element& element) const override { return nullptr; }
 
     virtual FontSelector* fontSelector() const { return 0; }
     virtual HostWindow* hostWindow() const { return 0; }
 
     virtual PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollableArea*, ScrollbarOrientation, ScrollbarControlSize) { return nullptr; }
 
     void setDisabledIndex(unsigned index) { m_disabledIndexSet.insert(index); }
     void setFocusedNode(Node* node) { m_node = node; }
     void setListSize(int listSize) { m_listSize = listSize; }
 
 private:
     unsigned m_selectIndex;
     std::set<unsigned> m_disabledIndexSet;
     Node* m_node;
     int m_listSize;
+    int m_indexToSelectOnCancel;
 };
 
 class TestWebWidgetClient : public WebWidgetClient {
 public:
     ~TestWebWidgetClient() { }
     virtual WebRect windowRect() { return m_windowRect; }
     virtual void setWindowRect(const WebRect& rect) { m_windowRect = rect; }
 private:
     WebRect m_windowRect;
 };
@@ skipping 474 matching lines @@
     ASSERT(menuList);
     menuList->showPopup();
     ASSERT(popupOpen());
     PopupListBox* listBox = webView()->selectPopup()->listBox();
     int ltrWidth = listBox->getRowBaseWidth(0);
     int rtlWidth = listBox->getRowBaseWidth(1);
     EXPECT_LT(rtlWidth, ltrWidth);
 }
 
 } // namespace