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

[jcivelli at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3170586b33bef0a54fac14c25a3877a9a6bdd20c
Author: jcivelli at chromium.org <jcivelli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 01:33:25 2010 +0000

    2010-07-15  Jay Civelli  <jcivelli at chromium.org>
    
            Reviewed by David Levin.
    
            [chromium] Making the popup label color visible when the item is
            selected.
            https://bugs.webkit.org/show_bug.cgi?id=42271
    
            * platform/chromium/PopupMenuChromium.cpp:
            (WebCore::PopupListBox::paintRow): paint the label text with a
            different color when it is selected.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63504 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b3608fe..3f9fa9b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15  Jay Civelli  <jcivelli at chromium.org>
+
+        Reviewed by David Levin.
+
+        [chromium] Making the popup label color visible when the item is
+        selected.
+        https://bugs.webkit.org/show_bug.cgi?id=42271
+
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::paintRow): paint the label text with a
+        different color when it is selected. 
+
 2010-07-13  Zhenyao Mo  <zmo at google.com>
 
         Reviewed by Nate Chapin.
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index 41a758b..4701a75 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -877,13 +877,17 @@ void PopupListBox::paintRow(GraphicsContext* gc, const IntRect& rect, int rowInd
     PopupMenuStyle style = m_popupClient->itemStyle(rowIndex);
 
     // Paint background
-    Color backColor, textColor;
+    Color backColor, textColor, labelColor;
     if (rowIndex == m_selectedIndex) {
         backColor = RenderTheme::defaultTheme()->activeListBoxSelectionBackgroundColor();
         textColor = RenderTheme::defaultTheme()->activeListBoxSelectionForegroundColor();
+        labelColor = textColor;
     } else {
         backColor = style.backgroundColor();
         textColor = style.foregroundColor();
+        // FIXME: for now the label color is hard-coded. It should be added to
+        // the PopupMenuStyle.
+        labelColor = Color(115, 115, 115);
     }
 
     // If we have a transparent background, make sure it has a color to blend
@@ -968,9 +972,7 @@ void PopupListBox::paintRow(GraphicsContext* gc, const IntRect& rect, int rowInd
         textX = rowRect.width() - rightPadding - itemFont.width(labelTextRun);
     }
 
-    // FIXME: for now the label color is hard-coded. It should be added to the
-    //        PopupMenuStyle.
-    gc->setFillColor(Color(115, 115, 115), DeviceColorSpace);
+    gc->setFillColor(labelColor, DeviceColorSpace);
     gc->drawBidiText(itemFont, labelTextRun, IntPoint(textX, textY));
 }
 

-- 
WebKit Debian packaging