Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: Source/WebCore/platform/chromium/PopupContainer.cpp

Issue 10442063: Merge 118768 - [Chromium] [Regression] SELECT popup misplaced when there is not enough vertical spa… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/chromium/PopupContainer.cpp
===================================================================
--- Source/WebCore/platform/chromium/PopupContainer.cpp (revision 118772)
+++ Source/WebCore/platform/chromium/PopupContainer.cpp (working copy)
@@ -185,13 +185,10 @@
else
m_listBox->setMaxHeight(spaceBelow);
layoutAndGetRTLOffset();
- // Our height has changed, so recompute only Y axis of widgetRect.
- // We don't have to recompute X axis, so we only replace Y axis
- // in widgetRect.
- IntRect frameInScreen = chromeClient->rootViewToScreen(frameRect());
- widgetRectInScreen.setY(frameInScreen.y());
- widgetRectInScreen.setHeight(frameInScreen.height());
- // And move upwards if necessary.
+ // Container height may have changed in layoutAndGetRTLOffset(),
+ // so set the WebWidget height to the container height.
+ widgetRectInScreen.setHeight(height());
+ // Move WebWidget upwards if necessary.
if (spaceAbove > spaceBelow)
widgetRectInScreen.move(0, -(widgetRectInScreen.height() + targetControlHeight));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698