Merge 114513

Source/WebCore/platform/chromium/PopupContainer.cpp

Index: Source/WebCore/platform/chromium/PopupContainer.cpp
===================================================================
--- Source/WebCore/platform/chromium/PopupContainer.cpp	(revision 115663)
+++ Source/WebCore/platform/chromium/PopupContainer.cpp	(working copy)
@@ -407,7 +407,7 @@
     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();
@@ -423,14 +423,9 @@
     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();
+
+    return widgetRectInScreen;
 }
 
 inline bool PopupContainer::isRTL() const