[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 07:01:48 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 60648563f4df64d16bea4128cc8016466c52385d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 16 19:57:09 2002 +0000

    	Implement the collapsing top margin quirk for <body> (the same
    	quirk used for table cells) and make sure it works even when the
    	<body> has margins of its own.
    
    	Fixes www.eflightpacks.com (the top frame was shoved down because
    	the <p> margin didn't collapse away).
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5cd1b5a..7157b2d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,17 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Implement the collapsing top margin quirk for <body> (the same
+	quirk used for table cells) and make sure it works even when the
+	<body> has margins of its own.
+
+	Fixes www.eflightpacks.com (the top frame was shoved down because
+	the <p> margin didn't collapse away).
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Sigh. Amazingly enough, all other browsers seem to treat
 	stray </p>s as <p></p> (Mac IE treats it as <br>, but
 	I'm going with the WinIE/Gecko behavior of <p></p>).
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5cd1b5a..7157b2d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,17 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Implement the collapsing top margin quirk for <body> (the same
+	quirk used for table cells) and make sure it works even when the
+	<body> has margins of its own.
+
+	Fixes www.eflightpacks.com (the top frame was shoved down because
+	the <p> margin didn't collapse away).
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Sigh. Amazingly enough, all other browsers seem to treat
 	stray </p>s as <p></p> (Mac IE treats it as <br>, but
 	I'm going with the WinIE/Gecko behavior of <p></p>).
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5cd1b5a..7157b2d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,17 @@
 2002-11-16  David Hyatt  <hyatt at apple.com>
 
+	Implement the collapsing top margin quirk for <body> (the same
+	quirk used for table cells) and make sure it works even when the
+	<body> has margins of its own.
+
+	Fixes www.eflightpacks.com (the top frame was shoved down because
+	the <p> margin didn't collapse away).
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-16  David Hyatt  <hyatt at apple.com>
+
 	Sigh. Amazingly enough, all other browsers seem to treat
 	stray </p>s as <p></p> (Mac IE treats it as <br>, but
 	I'm going with the WinIE/Gecko behavior of <p></p>).
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 47f2939..a716a32 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -385,7 +385,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
     
     // Whether or not we are a quirky container, i.e., do we collapse away top and bottom
     // margins in our container.
-    bool quirkContainer = isTableCell();
+    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
@@ -514,12 +514,14 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
                 // This child is collapsing with the top of the
                 // block.  If it has larger margin values, then we need to update
                 // our own maximal values.
-                if (posTop > m_maxTopPosMargin)
-                    m_maxTopPosMargin = posTop;
+                if (strictMode || !quirkContainer || !topQuirk) {
+                    if (posTop > m_maxTopPosMargin)
+                        m_maxTopPosMargin = posTop;
+                
+                    if (negTop > m_maxTopNegMargin)
+                        m_maxTopNegMargin = negTop;
+                }
                 
-                if (negTop > m_maxTopNegMargin)
-                    m_maxTopNegMargin = negTop;
-                 
                 // The minute any of the margins involved isn't a quirk, don't
                 // collapse it away, even if the margin is smaller (www.webreference.com
                 // has an example of this, a <dt> with 0.8em author-specified inside

-- 
WebKit Debian packaging

