[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 de8798e2e47d81e294392b66f8946e782e14ea7b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 13 03:24:29 2002 +0000

    	Fix for 3032869, the background image for the body was being
    	propagated up to the root properly but was not being tiled over
    	the whole canvas.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::printBackground):
            * khtml/rendering/render_html.cpp:
            (RenderHtml::printBoxDecorations):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 77d943b..1bc9e80 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3032869, the background image for the body was being
+	propagated up to the root properly but was not being tiled over
+	the whole canvas.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the top of moveabletype.org.  The maxwidth/minwidth
 	calculation for blocks with inline content did not properly
 	deal with margins and padding on inline elements like <a>.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 77d943b..1bc9e80 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3032869, the background image for the body was being
+	propagated up to the root properly but was not being tiled over
+	the whole canvas.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the top of moveabletype.org.  The maxwidth/minwidth
 	calculation for blocks with inline content did not properly
 	deal with margins and padding on inline elements like <a>.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 77d943b..1bc9e80 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2002-11-12  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3032869, the background image for the body was being
+	propagated up to the root properly but was not being tiled over
+	the whole canvas.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+        * khtml/rendering/render_html.cpp:
+        (RenderHtml::printBoxDecorations):
+
+2002-11-12  David Hyatt  <hyatt at apple.com>
+
 	Fix the top of moveabletype.org.  The maxwidth/minwidth
 	calculation for blocks with inline content did not properly
 	deal with margins and padding on inline elements like <a>.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 29f7cb1..06bc2da 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -217,7 +217,7 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
         {
             //scroll
             int pw = m_width - vpab;
-            int h = m_height;
+            int h = isHtml() ? h : m_height;
             if (isTableCell()) {
                 // Table cells' m_height variable is wrong.  You have to take into
                 // account this hack extra stuff to get the right height. 
diff --git a/WebCore/khtml/rendering/render_html.cpp b/WebCore/khtml/rendering/render_html.cpp
index 882814f..3efaa3f 100644
--- a/WebCore/khtml/rendering/render_html.cpp
+++ b/WebCore/khtml/rendering/render_html.cpp
@@ -77,18 +77,19 @@ void RenderHtml::printBoxDecorations(QPainter *p,int, int _y,
 
 //    kdDebug(0) << "width = " << w <<endl;
 
-    int rw;
+    int rw, rh;
     if (root()->view())
         rw=root()->view()->contentsWidth();
     else
         rw=root()->width();
-
+    rh=root()->height();
+    
 //    kdDebug(0) << "rw = " << rw <<endl;
 
     int bx = _tx - marginLeft();
     int by = _ty - marginTop();
     int bw = QMAX(w + marginLeft() + marginRight() + borderLeft() + borderRight(), rw);
-    int bh = QMAX(h + marginTop() + marginBottom() + borderTop() + borderBottom(), parent()->height());
+    int bh = QMAX(h + marginTop() + marginBottom() + borderTop() + borderBottom(), rh);
 
     // CSS2 14.2:
     // " The background of the box generated by the root element covers the entire canvas."

-- 
WebKit Debian packaging