[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 40e9f33c44fe5a9ce8116776024c391c3d7993f3
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 13:54:10 2010 +0000

    2010-11-10  Ilya Sherman  <isherman at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d073be6..d68af7d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-10  Ilya Sherman  <isherman at 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 at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index 0649285..d7899ba 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -1255,14 +1255,10 @@ void PopupListBox::layout()
     // Size our child items.
     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.
         String text = m_popupClient->itemText(i);
@@ -1303,7 +1299,10 @@ void PopupListBox::layout()
 #endif
 
     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.
         if (windowHeight + rowHeight > m_maxHeight) {

-- 
WebKit Debian packaging