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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 521c87c4fce010e8853563d7d8f0f66b484d7a7a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 12 20:25:31 2002 +0000

    	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::printBackground):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2049 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index f07ee1c..14a6ac4 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
 	Fix crash on trekweb.com.  My simplified FOUC code was a little
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f07ee1c..14a6ac4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-09-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
 	Fix crash on trekweb.com.  My simplified FOUC code was a little
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f07ee1c..14a6ac4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-09-12  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed livepage crash on Marklar. It is naughty to divide by 0 on marklar so we now check before doing that.
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::printBackground):
+
 2002-09-12  David Hyatt  <hyatt at apple.com>
 
 	Fix crash on trekweb.com.  My simplified FOUC code was a little
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index c122a53..4fd05db 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -228,7 +228,11 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
             } else {
                 cw = w-vpab;
                 cx = _tx;
-                sx =  pixw - ((sptr->backgroundXPosition().minWidth(pw-pixw)) % pixw );
+                if(pixw == 0){
+                    sx = 0;
+                }else{
+                    sx =  pixw - ((sptr->backgroundXPosition().minWidth(pw-pixw)) % pixw );
+                }
             }
 
             cx += borderLeft();
@@ -239,7 +243,11 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
             } else {
                 ch = h-hpab;
                 cy = _ty;
-                sy = pixh - ((sptr->backgroundYPosition().minWidth(ph-pixh)) % pixh );
+                if(pixh == 0){
+                    sy = 0;
+                }else{
+                    sy = pixh - ((sptr->backgroundYPosition().minWidth(ph-pixh)) % pixh );
+                }
             }
 
             cy += borderTop();
@@ -260,7 +268,11 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
             } else {
                 cw = pw;
                 cx = vr.x();
-                sx =  pixw - ((sptr->backgroundXPosition().minWidth(pw-pixw)) % pixw );
+                if(pixw == 0){
+                    sx = 0;
+                }else{
+                    sx =  pixw - ((sptr->backgroundXPosition().minWidth(pw-pixw)) % pixw );
+                }
             }
 
             if( (bgr == NO_REPEAT || bgr == REPEAT_X) && h > pixh ) {
@@ -269,7 +281,11 @@ void RenderBox::printBackground(QPainter *p, const QColor &c, CachedImage *bg, i
             } else {
                 ch = ph;
                 cy = vr.y();
-                sy = pixh - ((sptr->backgroundYPosition().minWidth(ph-pixh)) % pixh );
+                if(pixh == 0){
+                    sy = 0;
+                }else{
+                    sy = pixh - ((sptr->backgroundYPosition().minWidth(ph-pixh)) % pixh );
+                }
             }
 
             QRect fix(cx,cy,cw,ch);

-- 
WebKit Debian packaging