[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 6e9a20e85a342b26a6626de199f73002a8f1c394
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 31 21:13:29 2003 +0000

            Reviewed by me, Dave wrote the code.
    
            - fixed 3162013 -- Safari collapses margins through bottom borders (affects top of zeldman.com)
    
            * khtml/rendering/render_flow.cpp: (RenderFlow::layoutBlockChildren):
            Don't collapse if we have any bottom border or padding.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3526 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 609d16b..17d30f9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-01-31  Darin Adler  <darin at apple.com>
 
+        Reviewed by me, Dave wrote the code.
+
+        - fixed 3162013 -- Safari collapses margins through bottom borders (affects top of zeldman.com)
+
+        * khtml/rendering/render_flow.cpp: (RenderFlow::layoutBlockChildren):
+        Don't collapse if we have any bottom border or padding.
+
+2003-01-31  Darin Adler  <darin at apple.com>
+
         Reviewed by Dave.
 
         - fixed 3160442 -- no top image map at ebay, caused by referrer returning null instead of empty string
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 609d16b..17d30f9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-01-31  Darin Adler  <darin at apple.com>
 
+        Reviewed by me, Dave wrote the code.
+
+        - fixed 3162013 -- Safari collapses margins through bottom borders (affects top of zeldman.com)
+
+        * khtml/rendering/render_flow.cpp: (RenderFlow::layoutBlockChildren):
+        Don't collapse if we have any bottom border or padding.
+
+2003-01-31  Darin Adler  <darin at apple.com>
+
         Reviewed by Dave.
 
         - fixed 3160442 -- no top image map at ebay, caused by referrer returning null instead of empty string
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index c92b763..96cf835 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -744,10 +744,11 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
     bool autoHeight = style()->height().isVariable() && style()->height().value == 0;
     
     // If any height other than auto is specified in CSS, then we don't collapse our bottom
-    // margins with our children's margins.  To do otherwise would be to risk odd visual
+    // margins with our children's margins. To do otherwise would be to risk odd visual
     // effects when the children overflow out of the parent block and yet still collapse
-    // with it.
-    if (canCollapseWithChildren && !autoHeight)
+    // with it. We also don't collapse if we had any bottom border/padding (represented by
+    // |toAdd|.
+    if (canCollapseWithChildren && (toAdd || !autoHeight))
         canCollapseWithChildren = false;
     
     // If we can't collapse with children then go ahead and add in the bottom margins.

-- 
WebKit Debian packaging