[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 8b4a5460cd6d3fca07f658d2f223e8b51baca383
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 19 22:48:01 2002 +0000

    	Fix backgrounds not painting in deployment builds.
            * khtml/rendering/render_box.cpp:
            (RenderBox::paintBackground):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b619d6c..2990151 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	Fix backgrounds not painting in deployment builds.
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBackground):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- a first step towards atomic identifiers in JavaScript
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b619d6c..2990151 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	Fix backgrounds not painting in deployment builds.
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBackground):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- a first step towards atomic identifiers in JavaScript
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b619d6c..2990151 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	Fix backgrounds not painting in deployment builds.
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBackground):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- a first step towards atomic identifiers in JavaScript
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 2ad4fb5..2f52820 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -189,13 +189,13 @@ void RenderBox::paintBoxDecorations(QPainter *p,int, int _y,
         paintBorder(p, _tx, _ty, w, h, style());
 }
 
-void RenderBox::paintBackground(QPainter *p, const QColor &c, CachedImage *bg, int clipy, int cliph, int _tx, int _ty, int w, int h)
+void RenderBox::paintBackground(QPainter *p, const QColor &c, CachedImage *bg, int clipy, int cliph, int _tx, int _ty, int w, int height)
 {
     if(c.isValid())
         p->fillRect(_tx, clipy, w, cliph, c);
     // no progressive loading of the background image
     if(bg && bg->pixmap_size() == bg->valid_rect().size() && !bg->isTransparent() && !bg->isErrorImage()) {
-        //kdDebug( 6040 ) << "printing bgimage at " << _tx << "/" << _ty << endl;
+        //kdDebug( 6040 ) << "painting bgimage at " << _tx << "/" << _ty << endl;
         // ### might need to add some correct offsets
         // ### use paddingX/Y
 
@@ -217,8 +217,8 @@ void RenderBox::paintBackground(QPainter *p, const QColor &c, CachedImage *bg, i
         {
             //scroll
             int pw = m_width - vpab;
-            int h = isHtml() ? h : m_height;
-            if (isTableCell()) {
+            int h = isHtml() ? height : 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. 
                 // Otherwise using background-position: bottom won't work in
@@ -284,7 +284,7 @@ void RenderBox::paintBackground(QPainter *p, const QColor &c, CachedImage *bg, i
                 }
             }
 
-            if( (bgr == NO_REPEAT || bgr == REPEAT_X) && h > pixh ) {
+            if( (bgr == NO_REPEAT || bgr == REPEAT_X) && height > pixh ) {
                 ch = pixh;
                 cy = vr.y() + sptr->backgroundYPosition().minWidth(ph-pixh);
             } else {
@@ -298,7 +298,7 @@ void RenderBox::paintBackground(QPainter *p, const QColor &c, CachedImage *bg, i
             }
 
             QRect fix(cx,cy,cw,ch);
-            QRect ele(_tx+borderLeft(),_ty+borderTop(),w-vpab,h-hpab);
+            QRect ele(_tx+borderLeft(),_ty+borderTop(),w-vpab,height-hpab);
             QRect b = fix.intersect(ele);
             sx+=b.x()-cx;
             sy+=b.y()-cy;

-- 
WebKit Debian packaging