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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 37d52b5469b2e1c0674b9423420e1807fa54854c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 1 21:55:27 2004 +0000

            Based on a fix by Eric Albert.
    
            - fixed <rdar://problem/3594247>: Safari crashes when a background image has a height or width of 0
    
            * khtml/rendering/render_box.cpp: (RenderBox::paintBackgroundExtended):
            Change code path so we don't mod with 0.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6300 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4d4064f..bbd9f77 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-04-01  Darin Adler  <darin at apple.com>
 
+        Based on a fix by Eric Albert.
+
+        - fixed <rdar://problem/3594247>: Safari crashes when a background image has a height or width of 0
+
+        * khtml/rendering/render_box.cpp: (RenderBox::paintBackgroundExtended):
+        Change code path so we don't mod with 0.
+
+2004-04-01  Darin Adler  <darin at apple.com>
+
         Reviewed by Dave.
 
         - fixed <rdar://problem/3608305>: DEMO: menu in search field has one disabled item: localized string not found
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 5774652..ea45ecb 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -360,9 +360,10 @@ void RenderBox::paintBackgroundExtended(QPainter *p, const QColor &c, CachedImag
                 cx = _tx;
                 if (pixw == 0)
                     sx = 0;
-                else
+                else {
                     sx =  pixw - ((sptr->backgroundXPosition().minWidth(pw-pixw)) % pixw );
-                sx -= bleft % pixw;
+                    sx -= bleft % pixw;
+                }
             }
 
             if( (bgr == NO_REPEAT || bgr == REPEAT_X) && h > pixh ) {
@@ -388,8 +389,8 @@ void RenderBox::paintBackgroundExtended(QPainter *p, const QColor &c, CachedImag
                     sy = 0;
                 }else{
                     sy = pixh - ((sptr->backgroundYPosition().minWidth(ph-pixh)) % pixh );
+                    sy -= borderTop() % pixh;
                 }
-                sy -= borderTop() % pixh;
             }
         }
         else

-- 
WebKit Debian packaging