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

Sat Sep 26 06:38:39 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 443c627dd3c481901d95ec0a82dfdb7d153a2b86
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 13 01:04:03 2002 +0000

    	KHTML was butchering the laws of background propagation from
    	the <body> to the <html>.  This fixes the logical flaws and
    	makes some of the geekiest CSS on the planet render correctly. ;)
    
            * khtml/rendering/render_body.cpp:
            (RenderBody::printBoxDecorations):
            * khtml/rendering/render_html.cpp:
            (RenderHtml::printBoxDecorations):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2053 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 59d5e8b..786416c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	KHTML was butchering the laws of background propagation from
+	the <body> to the <html>.  This fixes the logical flaws and
+	makes some of the geekiest CSS on the planet render correctly. ;)
+	
+        * khtml/rendering/render_body.cpp:
+        (RenderBody::printBoxDecorations):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Make fixed positioned elements work when you scroll.  We were
 	just missing the implementation of a QScrollView method.
 	
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 59d5e8b..786416c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	KHTML was butchering the laws of background propagation from
+	the <body> to the <html>.  This fixes the logical flaws and
+	makes some of the geekiest CSS on the planet render correctly. ;)
+	
+        * khtml/rendering/render_body.cpp:
+        (RenderBody::printBoxDecorations):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Make fixed positioned elements work when you scroll.  We were
 	just missing the implementation of a QScrollView method.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 59d5e8b..786416c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
+	KHTML was butchering the laws of background propagation from
+	the <body> to the <html>.  This fixes the logical flaws and
+	makes some of the geekiest CSS on the planet render correctly. ;)
+	
+        * khtml/rendering/render_body.cpp:
+        (RenderBody::printBoxDecorations):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-09-12  David Hyatt  <hyatt at apple.com>
+
 	Make fixed positioned elements work when you scroll.  We were
 	just missing the implementation of a QScrollView method.
 	
diff --git a/WebCore/khtml/rendering/render_body.cpp b/WebCore/khtml/rendering/render_body.cpp
index 7394532..4eee453 100644
--- a/WebCore/khtml/rendering/render_body.cpp
+++ b/WebCore/khtml/rendering/render_body.cpp
@@ -54,12 +54,13 @@ void RenderBody::printBoxDecorations(QPainter *p,int, int _y,
 {
     //kdDebug( 6040 ) << renderName() << "::printDecorations()" << endl;
     QColor c;
-    if( parent()->style()->backgroundColor().isValid() )
-	c =  style()->backgroundColor();
     CachedImage *bg = 0;
-    if( parent()->style()->backgroundImage() )
-	bg = style()->backgroundImage();
-
+    
+    if (parent()->style()->backgroundColor().isValid() || parent()->style()->backgroundImage()) {
+        c =  style()->backgroundColor();
+        bg = style()->backgroundImage();
+    }
+    
     int w = width();
     int h = height() + borderTopExtra() + borderBottomExtra();
     _ty -= borderTopExtra();
@@ -74,8 +75,7 @@ void RenderBody::printBoxDecorations(QPainter *p,int, int _y,
     printBackground(p, c, bg, my, mh, _tx, _ty, w, h);
 
     if(style()->hasBorder())
-	printBorder( p, _tx, _ty, w, h, style() );
-
+        printBorder(p, _tx, _ty, w, h, style());
 }
 
 void RenderBody::repaint()
diff --git a/WebCore/khtml/rendering/render_html.cpp b/WebCore/khtml/rendering/render_html.cpp
index 551ecab..31db5e3 100644
--- a/WebCore/khtml/rendering/render_html.cpp
+++ b/WebCore/khtml/rendering/render_html.cpp
@@ -62,15 +62,15 @@ void RenderHtml::printBoxDecorations(QPainter *p,int, int _y,
     QColor c = style()->backgroundColor();
     CachedImage *bg = style()->backgroundImage();
 
-    if( firstChild() ) {
-	if( !c.isValid() )
-	    c = firstChild()->style()->backgroundColor();
-	if( !bg )
-	    bg = firstChild()->style()->backgroundImage();
+    if (!c.isValid() && !bg && firstChild()) {
+        if (!c.isValid())
+            c = firstChild()->style()->backgroundColor();
+        if (!bg)
+            bg = firstChild()->style()->backgroundImage();
         if( !c.isValid() && root()->view())
             c = root()->view()->palette().active().color(QColorGroup::Base);
     }
-
+    
     int w = width();
     int h = height();
 

-- 
WebKit Debian packaging

