[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 f9e981ea46bbd3679b45f5d55b72065edc48f909
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 2 22:00:02 2002 +0000

    	Undo my changes to margin collapsing for blocks inside inlines.
    	Although they may be correct in a strict mode, they don't
    	work with the real-world Web.  For now, I'm just backing out
    	the code.  The CSS WG hasn't decided how this should work yet
    	anyway, so I'll just let the quirk behavior be our behavior
    	in both modes.
    
    	This fixes aintitcool.com.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 571abeb..44d33b6 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,17 @@
+2002-12-02  David Hyatt  <hyatt at apple.com>
+
+	Undo my changes to margin collapsing for blocks inside inlines.
+	Although they may be correct in a strict mode, they don't
+	work with the real-world Web.  For now, I'm just backing out
+	the code.  The CSS WG hasn't decided how this should work yet
+	anyway, so I'll just let the quirk behavior be our behavior
+	in both modes.
+
+	This fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-12-01  David Hyatt  <hyatt at apple.com>
 
 	Convert the WebCore cache from LRU to size-adjusted and
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 571abeb..44d33b6 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-12-02  David Hyatt  <hyatt at apple.com>
+
+	Undo my changes to margin collapsing for blocks inside inlines.
+	Although they may be correct in a strict mode, they don't
+	work with the real-world Web.  For now, I'm just backing out
+	the code.  The CSS WG hasn't decided how this should work yet
+	anyway, so I'll just let the quirk behavior be our behavior
+	in both modes.
+
+	This fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-12-01  David Hyatt  <hyatt at apple.com>
 
 	Convert the WebCore cache from LRU to size-adjusted and
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 571abeb..44d33b6 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-12-02  David Hyatt  <hyatt at apple.com>
+
+	Undo my changes to margin collapsing for blocks inside inlines.
+	Although they may be correct in a strict mode, they don't
+	work with the real-world Web.  For now, I'm just backing out
+	the code.  The CSS WG hasn't decided how this should work yet
+	anyway, so I'll just let the quirk behavior be our behavior
+	in both modes.
+
+	This fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
 2002-12-01  David Hyatt  <hyatt at apple.com>
 
 	Convert the WebCore cache from LRU to size-adjusted and
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 7352fcb..081bc66 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -428,9 +428,9 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
 
     // Whether or not we can collapse our own margins with our children.  We don't do this
     // if we had any border/padding (obviously), if we're the root or HTML elements, or if
-    // we're positioned, floating, a table cell, or a block that has split an inline.
+    // we're positioned, floating, a table cell.
     bool canCollapseWithChildren = !isRoot() && !isHtml() && !isPositioned() && 
-      !isFloating() && !isTableCell() && !continuation() && (m_height == 0);
+      !isFloating() && !isTableCell() && (m_height == 0);
     
     // Whether or not we are a quirky container, i.e., do we collapse away top and bottom
     // margins in our container.
@@ -545,9 +545,6 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
 
         // Now determine the correct ypos based off examination of collapsing margin
         // values.
-        // Don't allow the collapsing of a block
-        // with a continuation, since it has inlines on either side of it.
-        shouldCollapseChild = !child->continuation();
         if (shouldCollapseChild) {
             // Get our max pos and neg top margins.
             int posTop = child->maxTopMargin(true);
@@ -636,8 +633,6 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
                 
                 if (prevPosMargin-prevNegMargin) {
                     bottomChildQuirk = child->isBottomMarginQuirk();
-                    if (child->continuation()) // We split an inline. Don't apply the quirk in this case.
-                        bottomChildQuirk = false;
                 }
             }
             child->setPos(child->xPos(), ypos);

-- 
WebKit Debian packaging