[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 b28d5463df0e526cbb612faf4775bf79e49763bd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 15 22:32:44 2003 +0000

            Reviewed by Darin and Don.
    
            - fixed 3419957 -- REGRESSION: lines drawn across multiple columns at washingtonpost.com
    
            * khtml/rendering/render_box.cpp: (RenderBox::calcWidth): Always use the width of the line
            rather than the width of the containing block for "flow around floats" blocks (<hr>).
            This undoes half of the change made to fix bug 3384609.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f8a8472..c471ce2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-09-15  Ken as Darin  <darin at apple.com>
+
+        Reviewed by Darin and Don.
+
+        - fixed 3419957 -- REGRESSION: lines drawn across multiple columns at washingtonpost.com
+
+        * khtml/rendering/render_box.cpp: (RenderBox::calcWidth): Always use the width of the line
+        rather than the width of the containing block for "flow around floats" blocks (<hr>).
+        This undoes half of the change made to fix bug 3384609.
+
 2003-09-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken and Don.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f8a8472..c471ce2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-09-15  Ken as Darin  <darin at apple.com>
+
+        Reviewed by Darin and Don.
+
+        - fixed 3419957 -- REGRESSION: lines drawn across multiple columns at washingtonpost.com
+
+        * khtml/rendering/render_box.cpp: (RenderBox::calcWidth): Always use the width of the line
+        rather than the width of the containing block for "flow around floats" blocks (<hr>).
+        This undoes half of the change made to fix bug 3384609.
+
 2003-09-15  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken and Don.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index 4c2bc5b..ab6ccc3 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -690,8 +690,7 @@ void RenderBox::calcWidth()
 
         int cw;
         RenderBlock *cb = containingBlock();
-        if (style()->width().isVariable() &&
-            (style()->hidesOverflow() || isFlexibleBox() || style()->flowAroundFloats()))
+        if ((style()->width().isVariable() && (style()->hidesOverflow() || isFlexibleBox())) || style()->flowAroundFloats())
             cw = cb->lineWidth( m_y );
         else
             cw = cb->contentWidth();

-- 
WebKit Debian packaging