Changeset 3526

Timestamp:

01/31/03 13:13:29 (6 years ago)

Author:

darin

Message:

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.

Location:

trunk/WebCore

Files:

• ChangeLog-2003-10-25 (modified) (1 diff)
• ChangeLog-2005-08-23 (modified) (1 diff)
• khtml/rendering/render_flow.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog-2003-10-25

@@ +1 @@
+2003-01-31  Darin Adler  <darin@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@apple.com>
 

trunk/WebCore/ChangeLog-2005-08-23

@@ +1 @@
+2003-01-31  Darin Adler  <darin@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@apple.com>
 

trunk/WebCore/khtml/rendering/render_flow.cpp

@@ -745 +745 @@
     
     // 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;