[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 93a6056fe52be4154217838b4054553025d42bd5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 22 02:49:58 2004 +0000

    	Fix for two margin collapsing edge cases.
    
            Reviewed by darin
    
            * khtml/rendering/render_block.cpp:
            (khtml::RenderBlock::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fe8858b..4b79943 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-01-21  David Hyatt  <hyatt at apple.com>
 
+	Fix for two margin collapsing edge cases.
+	
+        Reviewed by darin
+
+        * khtml/rendering/render_block.cpp:
+        (khtml::RenderBlock::layoutBlockChildren):
+
+2004-01-21  David Hyatt  <hyatt at apple.com>
+
 	Switch from expat to libxml and implement namespace support in the simplereader.
 	
         Reviewed by darin
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 5f7a6cc..f150d04 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -646,7 +646,7 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
             // for by simply checking the boolean |topMarginContributor| variable.  See
             // http://www.hixie.ch/tests/adhoc/css/box/block/margin-collapse/046.html for
             // an example of this scenario.
-            int marginOffset = !topMarginContributor ? (prevPosMargin - prevNegMargin) : 0;
+            int marginOffset = (!topMarginContributor || !canCollapseTopWithChildren) ? (prevPosMargin - prevNegMargin) : 0;
             
             m_height += marginOffset;
             positionNewFloats();
@@ -1029,7 +1029,7 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
         canCollapseBottomWithChildren = false;
     
     // If we can't collapse with children then go ahead and add in the bottom margins.
-    if (!canCollapseBottomWithChildren
+    if (!canCollapseBottomWithChildren && (!topMarginContributor || !canCollapseTopWithChildren)
         && (strictMode || !quirkContainer || !bottomChildQuirk))
         m_height += prevPosMargin - prevNegMargin;
 

-- 
WebKit Debian packaging