[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 a867c4cc7239187066e7ac402978f9f505e2c9a5
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 27 03:04:33 2002 +0000

    	Don't let blocks inside inlines collapse with their surroundings
    	ever.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0070cc4..aee9f0c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Don't let blocks inside inlines collapse with their surroundings
+	ever.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix a collapsing margin regression on aintitcool caused by
 	my support of blocks inside inlines.  A block could be wrapped
 	by an inline, e.g., <font><p>foo</p></font>, and in this case,
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0070cc4..aee9f0c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Don't let blocks inside inlines collapse with their surroundings
+	ever.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix a collapsing margin regression on aintitcool caused by
 	my support of blocks inside inlines.  A block could be wrapped
 	by an inline, e.g., <font><p>foo</p></font>, and in this case,
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0070cc4..aee9f0c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-11-26  David Hyatt  <hyatt at apple.com>
 
+	Don't let blocks inside inlines collapse with their surroundings
+	ever.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-11-26  David Hyatt  <hyatt at apple.com>
+
 	Fix a collapsing margin regression on aintitcool caused by
 	my support of blocks inside inlines.  A block could be wrapped
 	by an inline, e.g., <font><p>foo</p></font>, and in this case,
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index e8975fe..6ec4ddd 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1386,7 +1386,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
             }
             goto end;
         }
-
+        
         last = o;
         o = Bidinext( start.par, o );
 
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 3d11421..7352fcb 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, or a table cell.
+    // we're positioned, floating, a table cell, or a block that has split an inline.
     bool canCollapseWithChildren = !isRoot() && !isHtml() && !isPositioned() && 
-      !isFloating() && !isTableCell() && (m_height == 0);
+      !isFloating() && !isTableCell() && !continuation() && (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,6 +545,9 @@ 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);
@@ -559,8 +562,6 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
             // See if the top margin is quirky. We only care if this child has
             // margins that will collapse with us.
             bool topQuirk = child->isTopMarginQuirk();
-            if (child->continuation())
-                topQuirk = false;
                 
             if (canCollapseWithChildren && topMarginContributor && !clearOccurred) {
                 // This child is collapsing with the top of the

-- 
WebKit Debian packaging