Merge 113418

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 120 matching lines @@
     IntRect layoutAndCalculateWidgetRect(int targetControlHeight, const IntPoint& popupInitialCoordinate);
 
     // Returns the ChromeClient of the page this popup is associated with.
     ChromeClientChromium* chromeClientChromium();
 
     RefPtr<PopupListBox> m_listBox;
     RefPtr<FrameView> m_frameView;
 
     PopupContainerSettings m_settings;
     PopupType m_popupType;
+
+    // This contains the "ideal" dimensions and position for the popup
+    // (PopupContainer's frameRect() location should always be (0, 0), since
+    // it is rendered inside (and relative to) a WebWidget, which should get
+    // the actual popup position through chromeClientChromium()).
     IntRect m_originalFrameRect;
+
     // Whether the popup is currently open.
     bool m_popupOpen;
 };
 
 } // namespace WebCore
 
 #endif