2011-02-03 Abhishek Arya <inferno@chromium.org>
authorinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Feb 2011 01:25:06 +0000 (01:25 +0000)
committerinferno@chromium.org <inferno@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 4 Feb 2011 01:25:06 +0000 (01:25 +0000)
        Unreviewed, qt build fix.

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::removeFloatingObject):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp

index ce55fcb9b33edebf07083f0c47e34bd0886ede67..7d472d7f4af141761aeed53e1354fc770836330f 100644 (file)
@@ -1,3 +1,10 @@
+2011-02-03  Abhishek Arya  <inferno@chromium.org>
+
+        Unreviewed, qt build fix.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeFloatingObject):
+
 2011-02-03  Brian Salomon  <bsalomon@google.com>
 
         Reviewed by James Robinson.
index 5383610171f6f01f8c9be3795d5469b5266f198c..db229fdc01aa21da088e6cb4e14d5cf62b712bde 100644 (file)
@@ -3106,7 +3106,7 @@ void RenderBlock::removeFloatingObject(RenderBox* o)
                     // Special-case zero- and less-than-zero-height floats: those don't touch
                     // the line that they're on, but it still needs to be dirtied. This is
                     // accomplished by pretending they have a height of 1.
-                    logicalBottom = max(logicalBottom, max(logicalTop + 1, logicalTop));
+                    logicalBottom = max(logicalBottom, logicalTop == numeric_limits<int>::max() ? logicalTop : logicalTop + 1);
                     markLinesDirtyInBlockRange(0, logicalBottom);
                 }
                 m_floatingObjects->removeRef(it.current());