[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8d86f5fe9dcaa67319d2e8fa2a2177bfb4aadcd3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 09:38:36 2009 +0000

    2009-11-11  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] Make the default style background color valid.
            Currently the color is transparent but invalid, this causes
            list boxes in QtWebKit to be drawn with a black background
            since r49242.
            https://bugs.webkit.org/show_bug.cgi?id=31295
    
            * rendering/style/RenderStyle.h:
            (WebCore::InheritedFlags::initialBackgroundColor):
            * rendering/style/StyleBackgroundData.cpp:
            (WebCore::StyleBackgroundData::StyleBackgroundData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50796 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ce43187..9135cc1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-11  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Make the default style background color valid.
+        Currently the color is transparent but invalid, this causes
+        list boxes in QtWebKit to be drawn with a black background
+        since r49242.
+        https://bugs.webkit.org/show_bug.cgi?id=31295
+
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::initialBackgroundColor):
+        * rendering/style/StyleBackgroundData.cpp:
+        (WebCore::StyleBackgroundData::StyleBackgroundData):
+
 2009-11-10  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index 0605f1f..e497be8 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -1181,6 +1181,7 @@ public:
     static float initialPerspective() { return 0; }
     static Length initialPerspectiveOriginX() { return Length(50.0, Percent); }
     static Length initialPerspectiveOriginY() { return Length(50.0, Percent); }
+    static Color initialBackgroundColor() { return Color::transparent; }
 
     // Keep these at the end.
     static int initialLineClamp() { return -1; }
diff --git a/WebCore/rendering/style/StyleBackgroundData.cpp b/WebCore/rendering/style/StyleBackgroundData.cpp
index 68a9ddd..08f5527 100644
--- a/WebCore/rendering/style/StyleBackgroundData.cpp
+++ b/WebCore/rendering/style/StyleBackgroundData.cpp
@@ -22,12 +22,14 @@
 #include "config.h"
 #include "StyleBackgroundData.h"
 
+#include "RenderStyle.h"
 #include "RenderStyleConstants.h"
 
 namespace WebCore {
 
 StyleBackgroundData::StyleBackgroundData()
     : m_background(BackgroundFillLayer)
+    , m_color(RenderStyle::initialBackgroundColor())
 {
 }
 

-- 
WebKit Debian packaging