[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 84d840bca3dfb96ce09c735c7c403a45f5ce1251
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 22 02:22:21 2003 +0000

    	http://placenamehere.com/safari/fixedbgtest.html is now fixed with a patch from the KHTML trunk.
    	Fixed backgrounds repeated when they weren't supposed to.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::paintBackgroundExtended):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5236 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 459cfca..286585f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2003-10-21  David Hyatt  <hyatt at apple.com>
 
+	http://placenamehere.com/safari/fixedbgtest.html is now fixed with a patch from the KHTML trunk.
+	Fixed backgrounds repeated when they weren't supposed to.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBackgroundExtended):
+
+2003-10-21  David Hyatt  <hyatt at apple.com>
+
 	Change pseudo-element style resolution to be lazy and to not occur until the style is actually asked
 	for by the front end render objects.  Also fix first-letter to inherit properly from first-line styles.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 459cfca..286585f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-10-21  David Hyatt  <hyatt at apple.com>
 
+	http://placenamehere.com/safari/fixedbgtest.html is now fixed with a patch from the KHTML trunk.
+	Fixed backgrounds repeated when they weren't supposed to.
+	
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::paintBackgroundExtended):
+
+2003-10-21  David Hyatt  <hyatt at apple.com>
+
 	Change pseudo-element style resolution to be lazy and to not occur until the style is actually asked
 	for by the front end render objects.  Also fix first-letter to inherit properly from first-line styles.
 	
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index dfff36a..55d1366 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -401,7 +401,7 @@ void RenderBox::paintBackgroundExtended(QPainter *p, const QColor &c, CachedImag
             int pixw = bg->pixmap_size().width();
             int pixh = bg->pixmap_size().height();
             EBackgroundRepeat bgr = sptr->backgroundRepeat();
-            if( (bgr == NO_REPEAT || bgr == REPEAT_Y) && w > pixw ) {
+            if( (bgr == NO_REPEAT || bgr == REPEAT_Y) && pw > pixw ) {
                 cw = pixw;
                 cx = vr.x() + sptr->backgroundXPosition().minWidth(pw-pixw);
             } else {
@@ -414,7 +414,7 @@ void RenderBox::paintBackgroundExtended(QPainter *p, const QColor &c, CachedImag
                 }
             }
 
-            if( (bgr == NO_REPEAT || bgr == REPEAT_X) && h > pixh ) {
+            if( (bgr == NO_REPEAT || bgr == REPEAT_X) && ph > pixh ) {
                 ch = pixh;
                 cy = vr.y() + sptr->backgroundYPosition().minWidth(ph-pixh);
             } else {

-- 
WebKit Debian packaging