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

Source/web/PopupContainer.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 222 matching lines @@
     if (!m_listBox->parent())
         m_listBox->setParent(this);
 
     m_listBox->scrollToRevealSelection();
 
     invalidate();
 }
 
 void PopupContainer::hidePopup()
 {
-    m_listBox->abandon();
+    m_listBox->cancel();
 }
 
 void PopupContainer::notifyPopupHidden()
 {
     if (!m_popupOpen)
         return;
     m_popupOpen = false;
 
     // With Oilpan, we cannot assume that the FrameView's LocalFrame's
     // page is still available, as the LocalFrame itself may have been
@@ skipping 92 matching lines @@
 }
 
 bool PopupContainer::handleKeyEvent(const PlatformKeyboardEvent& event)
 {
     UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture);
     return m_listBox->handleKeyEvent(event);
 }
 
 void PopupContainer::hide()
 {
-    m_listBox->abandon();
+    m_listBox->cancel();
 }
 
 void PopupContainer::paint(GraphicsContext* gc, const IntRect& paintRect)
 {
     TransformRecorder transformRecorder(*gc, *this, AffineTransform::translation(x(),  y()));
     IntRect adjustedPaintRect = intersection(paintRect, frameRect());
     adjustedPaintRect.moveBy(-location());
 
     m_listBox->paint(gc, adjustedPaintRect);
     paintBorder(gc, adjustedPaintRect);
@@ skipping 21 matching lines @@
 {
     return m_frameView->frame().page()->chrome().client();
 }
 
 void PopupContainer::showInRect(const FloatQuad& controlPosition, const IntSize& controlSize, FrameView* v, int index)
 {
     // The controlSize is the size of the select box. It's usually larger than
     // we need. Subtract border size so that usually the container will be
     // displayed exactly the same width as the select box.
     m_listBox->setBaseWidth(std::max(controlSize.width() - borderSize * 2, 0));
-    m_listBox->setOriginalIndex(m_listBox->m_popupClient->selectedIndex());
+    m_listBox->setSelectedIndex(m_listBox->m_popupClient->selectedIndex());
     m_listBox->updateFromElement();
 
     // We set the selected item in updateFromElement(), and disregard the
     // index passed into this function (same as Webkit's PopupMenuWin.cpp)
     // FIXME: make sure this is correct, and add an assertion.
     // ASSERT(popupWindow(popup)->listBox()->selectedIndex() == index);
 
     // Save and convert the controlPosition to main window coords. Each point is converted separately
     // to window coordinates because the control could be in a transformed webview and then each point
     // would be transformed by a different delta.
@@ skipping 84 matching lines @@
 }
 
 IntPoint PopupContainer::convertSelfToChild(const Widget* child, const IntPoint& point) const
 {
     IntPoint newPoint = point;
     newPoint.moveBy(-child->location());
     return newPoint;
 }
 
 } // namespace blink