Changeset 71734 in webkit

Timestamp:

Nov 10, 2010 5:54:10 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-10 Ilya Sherman <​isherman@chromium.org>

Reviewed by Shinichiro Hamaji.

Fix autofill popup height computation -- take icon heights into account.
​https://bugs.webkit.org/show_bug.cgi?id=49306

• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::layout):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-10  Ilya Sherman  <isherman@chromium.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix autofill popup height computation -- take icon heights into account.
+        https://bugs.webkit.org/show_bug.cgi?id=49306
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::layout):
+
 2010-11-10  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -1256 +1256 @@
     int baseWidth = 0;
     int paddingWidth = 0;
-    int y = 0;
     for (int i = 0; i < numItems(); ++i) {
-        // Place the item vertically.
-        m_items[i]->yOffset = y;
         if (m_popupClient->itemStyle(i).isDisplayNone())
             continue;
         Font itemFont = getRowFont(i);
-        y += itemFont.height();
 
         // Ensure the popup is wide enough to fit this item.
@@ -1304 +1300 @@
 
     for (int i = 0; i < m_visibleRows; ++i) {
+        // Place the item vertically.
         int rowHeight = getRowHeight(i);
+        m_items[i]->yOffset = windowHeight;
+
 #if !OS(DARWIN)
         // Only clip the window height for non-Mac platforms.