[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 53f3dec7c181830597e1942987f2fbefe658e664
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 15 20:04:19 2002 +0000

    	Fix Hixie's blog.  Background images can be transparent, so
    	if the root's color isn't valid always do a fixup even if you
    	have a valid background image.
    
            * khtml/rendering/render_html.cpp:
            (RenderHtml::printBoxDecorations):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2698 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 2998bba..d982719 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix Hixie's blog.  Background images can be transparent, so
+	if the root's color isn't valid always do a fixup even if you
+	have a valid background image.
+	
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
 2002-11-15  Darin Adler  <darin at apple.com>
 
         * kwq/KWQWindowWidget.mm: (KWQWindowWidget::setFrameGeometry):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 2998bba..d982719 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix Hixie's blog.  Background images can be transparent, so
+	if the root's color isn't valid always do a fixup even if you
+	have a valid background image.
+	
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
 2002-11-15  Darin Adler  <darin at apple.com>
 
         * kwq/KWQWindowWidget.mm: (KWQWindowWidget::setFrameGeometry):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 2998bba..d982719 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix Hixie's blog.  Background images can be transparent, so
+	if the root's color isn't valid always do a fixup even if you
+	have a valid background image.
+	
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
 2002-11-15  Darin Adler  <darin at apple.com>
 
         * kwq/KWQWindowWidget.mm: (KWQWindowWidget::setFrameGeometry):
diff --git a/WebCore/khtml/rendering/render_html.cpp b/WebCore/khtml/rendering/render_html.cpp
index 3efaa3f..074503b 100644
--- a/WebCore/khtml/rendering/render_html.cpp
+++ b/WebCore/khtml/rendering/render_html.cpp
@@ -68,10 +68,11 @@ void RenderHtml::printBoxDecorations(QPainter *p,int, int _y,
             c = firstChild()->style()->backgroundColor();
         if (!bg)
             bg = firstChild()->style()->backgroundImage();
-        if( !c.isValid() && root()->view())
-            c = root()->view()->palette().active().color(QColorGroup::Base);
     }
     
+    if( !c.isValid() && root()->view())
+        c = root()->view()->palette().active().color(QColorGroup::Base);
+
     int w = width();
     int h = height();
 

-- 
WebKit Debian packaging