[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 552e30771b6d9eb84e7f7543010c51b985661337
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 22 22:11:23 2002 +0000

    	Fix for left-hand-side of wired.com.  A disturbingly basic
    	bug.  I was applying a parent's margins to its children
    	when collapsing, even if the parent had a border/padding set
    	that should have separated it from its kids.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2418 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 30ee1a3..2cba80e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for left-hand-side of wired.com.  A disturbingly basic
+	bug.  I was applying a parent's margins to its children
+	when collapsing, even if the parent had a border/padding set
+	that should have separated it from its kids.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Optimize my inline margin discarding to be smart about the
 	case when the inline has a block and its beginning or
 	end.  Fixes aintitcool.com.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 30ee1a3..2cba80e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for left-hand-side of wired.com.  A disturbingly basic
+	bug.  I was applying a parent's margins to its children
+	when collapsing, even if the parent had a border/padding set
+	that should have separated it from its kids.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Optimize my inline margin discarding to be smart about the
 	case when the inline has a block and its beginning or
 	end.  Fixes aintitcool.com.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 30ee1a3..2cba80e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Fix for left-hand-side of wired.com.  A disturbingly basic
+	bug.  I was applying a parent's margins to its children
+	when collapsing, even if the parent had a border/padding set
+	that should have separated it from its kids.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Optimize my inline margin discarding to be smart about the
 	case when the inline has a block and its beginning or
 	end.  Fixes aintitcool.com.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 5cb8f16..0d2b63c 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -368,8 +368,8 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
     bool topMarginContributor = true;
     
     // These flags track the previous maximal positive and negative margins.
-    int prevPosMargin = maxTopMargin(true);
-    int prevNegMargin = maxTopMargin(false);
+    int prevPosMargin = canCollapseWithChildren ? maxTopMargin(true) : 0;
+    int prevNegMargin = canCollapseWithChildren ? maxTopMargin(false) : 0;
     
     // Whether or not we encountered an element with clear set that actually had to
     // be pushed down below a float.

-- 
WebKit Debian packaging