Merge 114513

Source/WebCore/platform/chromium/PopupContainer.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 81 matching lines @@
 
     PopupListBox* listBox() const { return m_listBox.get(); }
 
     bool isRTL() const;
 
     // Gets the index of the item that the user is currently moused-over or
     // has selected with the keyboard up/down arrows.
     int selectedIndex() const;
 
     // Refresh the popup values from the PopupMenuClient.
-    void refresh(const IntRect& targetControlRect);
+    IntRect refresh(const IntRect& targetControlRect);
 
     // The menu per-item data.
     const WTF::Vector<PopupItem*>& popupData() const;
 
     // The height of a row in the menu.
     int menuItemHeight() const;
 
     // The size of the font being used.
     int menuItemFontSize() const;
 
@@ skipping 32 matching lines @@
     // the actual popup position through chromeClientChromium()).
     IntRect m_originalFrameRect;
 
     // Whether the popup is currently open.
     bool m_popupOpen;
 };
 
 } // namespace WebCore
 
 #endif