WebCore:

[WebKit-https.git] / WebCore / rendering / RenderBlock.cpp

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 7802be2f017711f950b742f232f563c60f540de0..0fa0b6f51550be7ce971758d380e743972054122 100644 (file)
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -2363,17 +2363,20 @@ RenderBlock::lineWidth(int y) const
     return (result < 0) ? 0 : result;
 }
 
-int
-RenderBlock::nearestFloatBottom(int height) const
+int RenderBlock::nextFloatBottomBelow(int height) const
 {
-    if (!m_floatingObjects) return 0;
-    int bottom = 0;
+    if (!m_floatingObjects)
+        return 0;
+
+    int bottom = INT_MAX;
     FloatingObject* r;
     DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
-    for ( ; (r = it.current()); ++it )
-        if (r->endY>height && (r->endY<bottom || bottom==0))
-            bottom=r->endY;
-    return max(bottom, height);
+    for ( ; (r = it.current()); ++it) {
+        if (r->endY > height)
+            bottom = min(r->endY, bottom);
+    }
+
+    return bottom == INT_MAX ? 0 : bottom;
 }
 
 int
@@ -2816,7 +2819,7 @@ int RenderBlock::getClearDelta(RenderObject *child)
 
     // We also clear floats if we are too big to sit on the same line as a float (and wish to avoid floats by default).
     // FIXME: Note that the remaining space checks aren't quite accurate, since you should be able to clear only some floats (the minimum # needed
-    // to fit) and not all (we should be using nearestFloatBottom and looping).
+    // to fit) and not all (we should be using nextFloatBottomBelow and looping).
     // Do not allow tables to wrap in quirks or even in almost strict mode 
     // (ebay on the PLT, finance.yahoo.com in the real world, versiontracker.com forces even almost strict mode not to work)
     int result = clearSet ? max(0, bottom - child->yPos()) : 0;