[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 5873ea0872e3473e90764de777799d353ac28f5f
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 30 22:10:10 2002 +0000

    	Fix for 3129016, make sure that zero-height tables and lists
    	will be skipped in a search for floats that occur before
    	them.  Makes usatoday work.
    
            Reviewed by gramps
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::clearFloats):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3214 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6f3d44e..9468d05 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-12-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3129016, make sure that zero-height tables and lists
+	will be skipped in a search for floats that occur before
+	them.  Makes usatoday work.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::clearFloats):
+
 2002-12-30  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6f3d44e..9468d05 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-12-30  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3129016, make sure that zero-height tables and lists
+	will be skipped in a search for floats that occur before
+	them.  Makes usatoday work.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::clearFloats):
+
 2002-12-30  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 32dd49e..4d9a945 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1257,7 +1257,9 @@ RenderFlow::clearFloats()
     while (prev) {
 	if (!prev->isFlow() || prev->isFloating() ||
 	    (prev->style()->flowAroundFloats() &&
-	     (static_cast<RenderFlow *>(prev)->floatBottom()+prev->yPos() < m_y ))) {
+        // A <table> or <ul> can have a height of 0, so its ypos may be the same
+        // as m_y.  That's why we have a <= and not a < here. -dwh
+	     (static_cast<RenderFlow *>(prev)->floatBottom()+prev->yPos() <= m_y ))) {
 	    if ( prev->isFloating() && parent()->isFlow() ) {
 		parentHasFloats = true;
 	    }

-- 
WebKit Debian packaging