[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 03867e37f74afdfd793156c65a260ef81d591bff
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 8 01:59:31 2003 +0000

    	Fix for 3220395.  nearestFloatBottom() mistakenly returned 0
    	when it ran out of floats to return.
    
            Reviewed by gramps
    
            * khtml/rendering/render_block.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4039 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 28a5ab4..e8d1c1b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-04-07  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3220395.  nearestFloatBottom() mistakenly returned 0
+	when it ran out of floats to return.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-07  David Hyatt  <hyatt at apple.com>
+
 	Fix for the scrollbar problem in 3220395.  Does not yet fix
 	the overlap problem.  lowest/rightmostPosition got broken by
 	the RenderFlow split.  This patch makes sure that we still crawl
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 28a5ab4..e8d1c1b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-04-07  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3220395.  nearestFloatBottom() mistakenly returned 0
+	when it ran out of floats to return.
+	
+        Reviewed by gramps
+
+        * khtml/rendering/render_block.cpp:
+
+2003-04-07  David Hyatt  <hyatt at apple.com>
+
 	Fix for the scrollbar problem in 3220395.  Does not yet fix
 	the overlap problem.  lowest/rightmostPosition got broken by
 	the RenderFlow split.  This patch makes sure that we still crawl
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 3d7ab7d..506dadb 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1447,13 +1447,13 @@ int
 RenderBlock::nearestFloatBottom(int height) const
 {
     if (!m_floatingObjects) return 0;
-    int bottom=0;
+    int bottom = 0;
     FloatingObject* r;
     QPtrListIterator<FloatingObject> it(*m_floatingObjects);
     for ( ; (r = it.current()); ++it )
         if (r->endY>height && (r->endY<bottom || bottom==0))
             bottom=r->endY;
-    return bottom;
+    return QMAX(bottom, height);
 }
 
 int

-- 
WebKit Debian packaging