<rdar://problem/9296211> REGRESSION (r83514): Failing fast/repaint/trailing-floats...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Apr 2011 20:23:14 +0000 (20:23 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 17 Apr 2011 20:23:14 +0000 (20:23 +0000)
https://bugs.webkit.org/show_bug.cgi?id=58745

Reviewed by Joseph Pecoraro.

This is really a regression from r82611, but it went unnoticed due to a mistake in r73385,
which was fixed in r83514.

* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::layoutInlineChildren): Actually assign the bottom visual overflow to the
variable so named, not the top layout overflow.

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

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlockLineLayout.cpp

index 3bdcaa1..90f720d 100644 (file)
@@ -1,3 +1,17 @@
+2011-04-17  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        <rdar://problem/9296211> REGRESSION (r83514): Failing fast/repaint/trailing-floats-root-line-box-overflow.html
+        https://bugs.webkit.org/show_bug.cgi?id=58745
+
+        This is really a regression from r82611, but it went unnoticed due to a mistake in r73385,
+        which was fixed in r83514.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren): Actually assign the bottom visual overflow to the
+        variable so named, not the top layout overflow.
+
 2011-04-17  Geoffrey Garen  <ggaren@apple.com>
 
         Strongly suggested, but not necessarily reviewed, by
index 09fc8b1..d00ddba 100644 (file)
@@ -1064,7 +1064,7 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintLogica
             // This has to be done before adding in the bottom border/padding, or the float will
             // include the padding incorrectly. -dwh
             if (checkForFloatsFromLastLine) {
-                int bottomVisualOverflow = lastRootBox()->logicalTopLayoutOverflow();
+                int bottomVisualOverflow = lastRootBox()->logicalBottomVisualOverflow();
                 int bottomLayoutOverflow = lastRootBox()->logicalBottomLayoutOverflow();
                 TrailingFloatsRootInlineBox* trailingFloatsLineBox = new (renderArena()) TrailingFloatsRootInlineBox(this);
                 m_lineBoxes.appendLineBox(trailingFloatsLineBox);