[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 d014c4b31e30f86c8cd485a1fffd018128f2c914
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 13 06:55:57 2002 +0000

    	Reverting a change that I unintentionally checked in last
    	week.  I wasn't yet ready to land it.  It may work, but I
    	want to test it more first.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1805 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 90b5d5b..5084080 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Reverting a change that I unintentionally checked in last
+	week.  I wasn't yet ready to land it.  It may work, but I
+	want to test it more first.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Implement clipping.  The one thing that still needs
 	to be done is that the intersect method in KWQRegion.mm
 	needs to be implemented.  Even without that, this gets
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90b5d5b..5084080 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Reverting a change that I unintentionally checked in last
+	week.  I wasn't yet ready to land it.  It may work, but I
+	want to test it more first.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Implement clipping.  The one thing that still needs
 	to be done is that the intersect method in KWQRegion.mm
 	needs to be implemented.  Even without that, this gets
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90b5d5b..5084080 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-08-12  David Hyatt  <hyatt at apple.com>
 
+	Reverting a change that I unintentionally checked in last
+	week.  I wasn't yet ready to land it.  It may work, but I
+	want to test it more first.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-08-12  David Hyatt  <hyatt at apple.com>
+
 	Implement clipping.  The one thing that still needs
 	to be done is that the intersect method in KWQRegion.mm
 	needs to be implemented.  Even without that, this gets
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 315aec8..cc0b3ad 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -488,7 +488,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
         child = child->nextSibling();
     }
 
-    if( isTableCell() || toAdd != 0)
+    if(!isTableCell() && toAdd != 0)
 	m_height += prevMargin;
     m_height += toAdd;
 

-- 
WebKit Debian packaging