[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 108d618a4c2b2495509db732df7ef15e6bdac5f1
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 25 09:19:01 2002 +0000

    	Fix for 3020493, another fun little margin collapsing quirk
    	that I missed. (<td><div><p>).  The <div> has to pick up the quirk
    	from the <p> so that the margins of the <p> still get collapsed
    	away.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2858 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 3534996..e20a889 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3020493, another fun little margin collapsing quirk
+	that I missed. (<td><div><p>).  The <div> has to pick up the quirk
+	from the <p> so that the margins of the <p> still get collapsed
+	away.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
 	Don't add in the halfleading for align=texttop. That's incorrect.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3534996..e20a889 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3020493, another fun little margin collapsing quirk
+	that I missed. (<td><div><p>).  The <div> has to pick up the quirk
+	from the <p> so that the margins of the <p> still get collapsed
+	away.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
 	Don't add in the halfleading for align=texttop. That's incorrect.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3534996..e20a889 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-11-25  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3020493, another fun little margin collapsing quirk
+	that I missed. (<td><div><p>).  The <div> has to pick up the quirk
+	from the <p> so that the margins of the <p> still get collapsed
+	away.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-25  David Hyatt  <hyatt at apple.com>
+
 	Don't add in the halfleading for align=texttop. That's incorrect.
 	
         * khtml/rendering/render_object.cpp:
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index c45c92a..de425ea 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -577,6 +577,12 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
                 // a <dl> inside a <td>.
                 if (!topQuirk && (posTop-negTop))
                     m_topMarginQuirk = false;
+                    
+                if (topQuirk && marginTop() == 0)
+                    // We have no top margin and our top child has a quirky margin.
+                    // We will pick up this quirky margin and pass it through.
+                    // This deals with the <td><div><p> case.
+                    m_topMarginQuirk = true;
             }
             
             if (quirkContainer && topMarginContributor && (posTop-negTop))
@@ -745,6 +751,12 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
            
         if (!bottomChildQuirk)
             m_bottomMarginQuirk = false;
+        
+        if (bottomChildQuirk && marginBottom() == 0)
+            // We have no bottom margin and our last child has a quirky margin.
+            // We will pick up this quirky margin and pass it through.
+            // This deals with the <td><div><p> case.
+            m_bottomMarginQuirk = true;
     }
     
     if (element() && element()->id() == ID__KONQBLOCK)

-- 
WebKit Debian packaging