Merge 114513

Source/WebCore/platform/chromium/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 389 matching lines @@
     // Move it below the select widget.
     location.move(0, r.height());
 
     m_originalFrameRect = IntRect(location, r.size());
 
     // Position at (0, 0) since the frameRect().location() is relative to the parent WebWidget.
     setFrameRect(IntRect(IntPoint(), r.size()));
     showPopup(v);
 }
 
-void PopupContainer::refresh(const IntRect& targetControlRect)
+IntRect PopupContainer::refresh(const IntRect& targetControlRect)
 {
     listBox()->setBaseWidth(max(m_originalFrameRect.width() - kBorderSize * 2, 0));
     listBox()->updateFromElement();
 
     IntPoint locationInWindow = m_frameView->contentsToWindow(targetControlRect.location());
 
     // Move it below the select widget.
     locationInWindow.move(0, targetControlRect.height());
 
     IntRect widgetRectInScreen = layoutAndCalculateWidgetRect(targetControlRect.height(), locationInWindow);
 
     // Reset the size (which can be set to the PopupListBox size in layoutAndGetRTLOffset(), exceeding the available widget rectangle.)
     if (size() != widgetRectInScreen.size())
         resize(widgetRectInScreen.size());
 
-    ChromeClientChromium* chromeClient = chromeClientChromium();
-    if (chromeClient) {
-        // Update the WebWidget location (which is relative to the screen origin).
-        if (widgetRectInScreen != chromeClient->windowRect())
-            chromeClient->setWindowRect(widgetRectInScreen);
-    }
+    invalidate();
 
-    invalidate();
+    return widgetRectInScreen;
 }
 
 inline bool PopupContainer::isRTL() const
 {
     return m_listBox->m_popupClient->menuStyle().textDirection() == RTL;
 }
 
 int PopupContainer::selectedIndex() const
 {
     return m_listBox->selectedIndex();
@@ skipping 20 matching lines @@
 }
 
 String PopupContainer::getSelectedItemToolTip()
 {
     // We cannot use m_popupClient->selectedIndex() to choose tooltip message,
     // because the selectedIndex() might return final selected index, not hovering selection.
     return listBox()->m_popupClient->itemToolTip(listBox()->m_selectedIndex);
 }
 
 } // namespace WebCore