[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 151b148970a42ff7f4d7b11177befa5064bdbb71
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 12 08:04:00 2004 +0000

    Adjust shouldCollapseChild as per dirk's suggestion.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6080 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 9fab63b..c910114 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -558,13 +558,6 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
     // margins in our container.
     bool quirkContainer = isTableCell() || isBody();
 
-    // Sometimes an element will be shoved down away from a previous sibling, e.g., when
-    // clearing to pass beyond a float.  In this case, you don't need to collapse.  This
-    // boolean is updated with each iteration through our child list to reflect whether
-    // that particular child should be collapsed with its previous sibling (or with the top
-    // of the block).
-    bool shouldCollapseChild = true;
-
     // This flag tracks whether the child should collapse with the top margins of the block.
     // It can remain set through multiple iterations as long as we keep encountering
     // self-collapsing blocks.
@@ -595,8 +588,13 @@ void RenderBlock::layoutBlockChildren( bool relayoutChildren )
 
     while( child != 0 )
     {
-        shouldCollapseChild = true; // Reset our shouldCollapseChild variable.
-        
+        // Sometimes an element will be shoved down away from a previous sibling, e.g., when
+        // clearing to pass beyond a float.  In this case, you don't need to collapse.  This
+        // boolean is updated with each iteration through our child list to reflect whether
+        // that particular child should be collapsed with its previous sibling (or with the top
+        // of the block).
+        bool shouldCollapseChild = true;
+                
         int oldTopPosMargin = m_maxTopPosMargin;
         int oldTopNegMargin = m_maxTopNegMargin;
 

-- 
WebKit Debian packaging