Changeset 77370 in webkit

Timestamp:

Feb 2, 2011 12:50:41 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Kent Tamura.

Fix popup menu RTL bug introduced by Changeset 75982.
​https://bugs.webkit.org/show_bug.cgi?id=53567

PopupMenuChromium::layout() calculates X position according to RTL or not. So Change the X position calculation in layoutAndCalculateWidgetRect().

No new tests. However we can check manually with select_dropdown_box_alignment.html, autofill_alignment.html, select_alignment.html, select_dropdown_box_alignment.html, autofill-popup-width-and-item-direction.html

• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupContainer::layoutAndCalculateWidgetRect): Fix calculation of x position, because layout() considers RTL. And change the parameter from both X and Y positions to only Y position. (WebCore::PopupContainer::showPopup): Change the passing parameter. (WebCore::PopupContainer::refresh): Change the passing parameter.
• platform/chromium/PopupMenuChromium.h: Change the parameter declaration.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/PopupMenuChromium.cpp (modified) (4 diffs)
• platform/chromium/PopupMenuChromium.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-02  Naoki Takano  <takano.naoki@gmail.com>
+
+        Reviewed by Kent Tamura.
+
+        Fix popup menu RTL bug introduced by Changeset 75982.
+        https://bugs.webkit.org/show_bug.cgi?id=53567
+
+        PopupMenuChromium::layout() calculates X position according to RTL or not. So Change the X position calculation in layoutAndCalculateWidgetRect().
+
+        No new tests. However we can check manually with select_dropdown_box_alignment.html, autofill_alignment.html, select_alignment.html, select_dropdown_box_alignment.html, autofill-popup-width-and-item-direction.html
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupContainer::layoutAndCalculateWidgetRect): Fix calculation of x position, because layout() considers RTL. And change the parameter from both X and Y positions to only Y position.
+        (WebCore::PopupContainer::showPopup): Change the passing parameter.
+        (WebCore::PopupContainer::refresh): Change the passing parameter.
+        * platform/chromium/PopupMenuChromium.h: Change the parameter declaration.
+
 2011-02-02  Alejandro G. Castro  <alex@igalia.com>
 

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

@@ -330 +330 @@
 }
 
-IntRect PopupContainer::layoutAndCalculateWidgetRect(int targetControlHeight, const IntPoint& popupInitialCoordinate)
+IntRect PopupContainer::layoutAndCalculateWidgetRect(int targetControlHeight, int popupInitialY)
 {
     // Reset the max height to its default value, it will be recomputed below
@@ -350 +350 @@
         // instead.
         FloatRect screen = screenAvailableRect(m_frameView.get());
-        widgetRect = chromeClient->windowToScreen(IntRect(popupInitialCoordinate, targetSize));
+        // Use this::x() for location because RTL position is considered
+        // in layout().
+        widgetRect = chromeClient->windowToScreen(IntRect(x(), popupInitialY, targetSize.width(), targetSize.height()));
         if (widgetRect.bottom() > static_cast<int>(screen.bottom())) {
             if (widgetRect.y() - widgetRect.height() - targetControlHeight > 0) {
@@ -383 +385 @@
     if (chromeClient) {
         IntRect popupRect = frameRect();
-        chromeClient->popupOpened(this, layoutAndCalculateWidgetRect(popupRect.height(), popupRect.location()), false);
+        chromeClient->popupOpened(this, layoutAndCalculateWidgetRect(popupRect.height(), popupRect.y()), false);
         m_popupOpen = true;
     }
@@ -581 +583 @@
     // Store the original height to check if we need to request the location.
     int originalHeight = height();
-    IntRect widgetRect = layoutAndCalculateWidgetRect(targetControlRect.height(), location);
+    IntRect widgetRect = layoutAndCalculateWidgetRect(targetControlRect.height(), location.y());
     if (originalHeight != widgetRect.height())
         setFrameRect(widgetRect);

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

@@ -195 +195 @@
 
     // Layout and calculate popup widget size and location and returns it as IntRect.
-    IntRect layoutAndCalculateWidgetRect(int targetControlHeight, const IntPoint& popupInitialCoordinate);
+    IntRect layoutAndCalculateWidgetRect(int targetControlHeight, int popupInitialY);
 
     // Returns the ChromeClient of the page this popup is associated with.