[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f5e9b9105b0b29c049822ca83d1b10c0b9c4139a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 22:06:11 2011 +0000

    2011-01-07  Jan Erik Hanssen  <jhanssen at sencha.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Black text on black buttons using a dark theme
            https://bugs.webkit.org/show_bug.cgi?id=35024
    
            Implement RenderThemeQt::systemColor to apply the correct colors from the current Qt style.
    
            * platform/qt/RenderThemeQt.cpp:
            (WebCore::RenderThemeQt::systemColor):
            * platform/qt/RenderThemeQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75273 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3c403c7..6a427a0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-07  Jan Erik Hanssen  <jhanssen at sencha.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Black text on black buttons using a dark theme
+        https://bugs.webkit.org/show_bug.cgi?id=35024
+
+        Implement RenderThemeQt::systemColor to apply the correct colors from the current Qt style.
+
+        * platform/qt/RenderThemeQt.cpp:
+        (WebCore::RenderThemeQt::systemColor):
+        * platform/qt/RenderThemeQt.h:
+
 2011-01-05  Adrienne Walker  <enne at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/platform/qt/RenderThemeQt.cpp b/WebCore/platform/qt/RenderThemeQt.cpp
index 6841882..2cc3625 100644
--- a/WebCore/platform/qt/RenderThemeQt.cpp
+++ b/WebCore/platform/qt/RenderThemeQt.cpp
@@ -32,6 +32,7 @@
 
 #include "CSSStyleSelector.h"
 #include "CSSStyleSheet.h"
+#include "CSSValueKeywords.h"
 #include "Chrome.h"
 #include "ChromeClientQt.h"
 #include "Color.h"
@@ -385,6 +386,19 @@ void RenderThemeQt::systemFont(int, FontDescription&) const
     // no-op
 }
 
+Color RenderThemeQt::systemColor(int cssValueId) const
+{
+    QPalette pal = QApplication::palette();
+    switch (cssValueId) {
+    case CSSValueButtontext:
+        return pal.brush(QPalette::Active, QPalette::ButtonText).color();
+    case CSSValueCaptiontext:
+        return pal.brush(QPalette::Active, QPalette::Text).color();
+    default:
+        return RenderTheme::systemColor(cssValueId);
+    }
+}
+
 int RenderThemeQt::minimumMenuListSize(RenderStyle*) const
 {
     const QFontMetrics &fm = QApplication::fontMetrics();
diff --git a/WebCore/platform/qt/RenderThemeQt.h b/WebCore/platform/qt/RenderThemeQt.h
index 3648abc..c28168a 100644
--- a/WebCore/platform/qt/RenderThemeQt.h
+++ b/WebCore/platform/qt/RenderThemeQt.h
@@ -73,6 +73,7 @@ public:
     virtual Color platformFocusRingColor() const;
 
     virtual void systemFont(int propId, FontDescription&) const;
+    virtual Color systemColor(int cssValueId) const;
 
     virtual int minimumMenuListSize(RenderStyle*) const;
 

-- 
WebKit Debian packaging