Changeset 80448 in webkit

Timestamp:

Mar 6, 2011 8:50:05 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-03-06 Naoki Takano <​takano.naoki@gmail.com>

Reviewed by Kent Tamura.

[Chromium] Autocomplete suggestion extends out of window (and onto second monitor)
​https://bugs.webkit.org/show_bug.cgi?id=54795

Implement width clip logic according to browser screen width and popup window width. This fix is enough for Win and Mac, but there is a problem in Linux. Because WebScreenInfoFactory::screenInfo() can get only merged screen size, not the screen size where the browser exists.

Test: manual-tests/popup-width-restriction-within-screen.html

• manual-tests/popup-width-restriction-within-screen.html: Added.
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::layoutAndCalculateWidgetRect): Implement the width clip logic according to screen width.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• manual-tests/popup-width-restriction-within-screen.html (added)
• platform/chromium/PopupMenuChromium.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-06  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Autocomplete suggestion extends out of window (and onto second monitor)
+        https://bugs.webkit.org/show_bug.cgi?id=54795
+
+        Implement width clip logic according to browser screen width and popup window width. This fix is enough for Win and Mac, but there is a problem in Linux. Because WebScreenInfoFactory::screenInfo() can get only merged screen size, not the screen size where the browser exists.
+
+        Test: manual-tests/popup-width-restriction-within-screen.html
+
+        * manual-tests/popup-width-restriction-within-screen.html: Added.
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupContainer::layoutAndCalculateWidgetRect): Implement the width clip logic according to screen width.
+
 2011-03-06  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -352 +352 @@
         // needs to be considered.
         widgetRect = chromeClient->windowToScreen(IntRect(popupInitialCoordinate.x() + rightOffset, popupInitialCoordinate.y(), targetSize.width(), targetSize.height()));
+
+        // If we have multiple screens and the browser rect is in one screen, we have
+        // to clip the window width to the screen width.
+        FloatRect windowRect = chromeClient->windowRect();
+        if (windowRect.x() >= screen.x() && windowRect.maxX() <= screen.maxX()) {
+            if (m_listBox->m_popupClient->menuStyle().textDirection() == RTL && widgetRect.x() < screen.x()) {
+                widgetRect.setWidth(widgetRect.maxX() - screen.x());
+                widgetRect.setX(screen.x());
+            } else if (widgetRect.maxX() > screen.maxX())
+                widgetRect.setWidth(screen.maxX() - widgetRect.x());
+        }
+
+        // Calculate Y axis size.
         if (widgetRect.maxY() > static_cast<int>(screen.maxY())) {
             if (widgetRect.y() - widgetRect.height() - targetControlHeight > 0) {
@@ -366 +379 @@
                     m_listBox->setMaxHeight(spaceBelow);
                 layoutAndGetRightOffset();
-                // Our size has changed, recompute the widgetRect.
-                widgetRect = chromeClient->windowToScreen(frameRect());
+                // 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->windowToScreen(frameRect());
+                widgetRect.setY(frameInScreen.y());
+                widgetRect.setHeight(frameInScreen.height());
                 // And move upwards if necessary.
                 if (spaceAbove > spaceBelow)