[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 0b0c4444b686982dd6882b65d76cc46eb587bbcd
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 21 00:52:11 2003 +0000

    	Fix for 3384609.  Objects that want to dodge floats should fill the line width instead
    	of the containing block width only if their widths are auto.  If widths are specified
    	explicitly, then ccontaining block width should be honored.
    
            Reviewed by john
    
            * khtml/rendering/render_box.cpp:
            (RenderBox::calcWidth):
            * khtml/rendering/render_table.cpp:
            (RenderTable::calcWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index beb2860..a0373bf 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-08-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3384609.  Objects that want to dodge floats should fill the line width instead
+	of the containing block width only if their widths are auto.  If widths are specified
+	explicitly, then ccontaining block width should be honored.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::calcWidth):
+
 2003-08-20  Richard Williamson   <rjw at apple.com>
 
 	UCFindTextBreak will report false if we have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that case.  Filed 3386852 to track this problem, meanwhile added a work-around.  This problem was revealed after adding the fix for 3242508.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index beb2860..a0373bf 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-08-20  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3384609.  Objects that want to dodge floats should fill the line width instead
+	of the containing block width only if their widths are auto.  If widths are specified
+	explicitly, then ccontaining block width should be honored.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_box.cpp:
+        (RenderBox::calcWidth):
+        * khtml/rendering/render_table.cpp:
+        (RenderTable::calcWidth):
+
 2003-08-20  Richard Williamson   <rjw at apple.com>
 
 	UCFindTextBreak will report false if we have a sequence of 0xa0 0x20 (nbsp, sp), so we explicity check for that case.  Filed 3386852 to track this problem, meanwhile added a work-around.  This problem was revealed after adding the fix for 3242508.
diff --git a/WebCore/khtml/rendering/render_box.cpp b/WebCore/khtml/rendering/render_box.cpp
index b3686b5..b72f5e5 100644
--- a/WebCore/khtml/rendering/render_box.cpp
+++ b/WebCore/khtml/rendering/render_box.cpp
@@ -696,7 +696,8 @@ void RenderBox::calcWidth()
 
         int cw;
         RenderBlock *cb = containingBlock();
-        if (style()->hidesOverflow() || isFlexibleBox() || style()->flowAroundFloats())
+        if (style()->width().isVariable() &&
+            (style()->hidesOverflow() || isFlexibleBox() || style()->flowAroundFloats()))
             cw = cb->lineWidth( m_y );
         else
             cw = cb->contentWidth();
diff --git a/WebCore/khtml/rendering/render_table.cpp b/WebCore/khtml/rendering/render_table.cpp
index 4250c53..6faf172 100644
--- a/WebCore/khtml/rendering/render_table.cpp
+++ b/WebCore/khtml/rendering/render_table.cpp
@@ -195,7 +195,7 @@ void RenderTable::calcWidth()
     }
 
     // restrict width to what we really have in case we flow around floats
-    if (style()->flowAroundFloats()) {
+    if (style()->width().isVariable() && style()->flowAroundFloats()) {
 	availableWidth = cb->lineWidth( m_y );
 	m_width = QMIN( availableWidth, m_width );
     }

-- 
WebKit Debian packaging