[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 10aec09622ca1f3aa2dd1059a480cd9bd4256218
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 5 21:23:34 2002 +0000

    	Make sure that blocks with block children compute their
    	minwidth and maxwidth correctly.  This fixes 4-5 bugs on my
    	list, including the becblog.blogspot.com misrender and
    	the wrapping list item on webstandards.org.
    
    	The fix ensures that the margins of a child have been
    	computed before they are asked for by the parent in
    	calcBlockMinMaxWidth.
    
    	Also fix a bug in collapsing margins that caused the height
    	of positioned elements that contained only zero-height children
    	to not compute their heights correctly.  We now pass tests 2
    	and 3 on the collapsing margin tests with this fix.
    
            Reviewed by: trey
    
    	* khtml/rendering/render_flow.cpp:
    	(RenderFlow::layoutBlockChildren):
    	(RenderFlow::calcBlockMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2947 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 8476769..3b0e7f1 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,25 @@
-=== Alexander-35 ===
+2002-12-05  David Hyatt  <hyatt at apple.com>
+
+	Make sure that blocks with block children compute their
+	minwidth and maxwidth correctly.  This fixes 4-5 bugs on my
+	list, including the becblog.blogspot.com misrender and
+	the wrapping list item on webstandards.org.
+
+	The fix ensures that the margins of a child have been
+	computed before they are asked for by the parent in
+	calcBlockMinMaxWidth.
 
+	Also fix a bug in collapsing margins that caused the height
+	of positioned elements that contained only zero-height children
+	to not compute their heights correctly.  We now pass tests 2
+	and 3 on the collapsing margin tests with this fix.  
+	
+        Reviewed by: trey
+
+	* khtml/rendering/render_flow.cpp:
+	(RenderFlow::layoutBlockChildren):
+	(RenderFlow::calcBlockMinMaxWidth):
+	
 2002-12-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for wsj.com orange underline regression.  In quirks mode
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8476769..3b0e7f1 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,25 @@
-=== Alexander-35 ===
+2002-12-05  David Hyatt  <hyatt at apple.com>
+
+	Make sure that blocks with block children compute their
+	minwidth and maxwidth correctly.  This fixes 4-5 bugs on my
+	list, including the becblog.blogspot.com misrender and
+	the wrapping list item on webstandards.org.
+
+	The fix ensures that the margins of a child have been
+	computed before they are asked for by the parent in
+	calcBlockMinMaxWidth.
 
+	Also fix a bug in collapsing margins that caused the height
+	of positioned elements that contained only zero-height children
+	to not compute their heights correctly.  We now pass tests 2
+	and 3 on the collapsing margin tests with this fix.  
+	
+        Reviewed by: trey
+
+	* khtml/rendering/render_flow.cpp:
+	(RenderFlow::layoutBlockChildren):
+	(RenderFlow::calcBlockMinMaxWidth):
+	
 2002-12-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for wsj.com orange underline regression.  In quirks mode
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 38eccc3..5d2e4d7 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -729,10 +729,8 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
         canCollapseWithChildren = false;
     
     // If we can't collapse with children then go ahead and add in the bottom margins.
-    if (!topMarginContributor && 
-        (!canCollapseWithChildren 
-            && (strictMode || !quirkContainer || !bottomChildQuirk)
-        ))
+    if (!canCollapseWithChildren 
+            && (strictMode || !quirkContainer || !bottomChildQuirk))
         m_height += prevPosMargin - prevNegMargin;
     
     m_height += toAdd;
@@ -1615,6 +1613,11 @@ void RenderFlow::calcBlockMinMaxWidth()
         }
         else
         {
+            // Call calcWidth on the child to ensure that our margins are
+            // up to date.  This method can be called before the child has actually
+            // calculated its margins (which are computed inside calcWidth).
+            child->calcWidth();
+            
             if (!(ml.type==Variable) && !(mr.type==Variable))
             {
                 if (!(child->style()->width().type==Variable))

-- 
WebKit Debian packaging