https://bugs.webkit.org/show_bug.cgi?id=67286
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Sep 2011 18:48:07 +0000 (18:48 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Sep 2011 18:48:07 +0000 (18:48 +0000)
REGRESSION: css2.1/t090204-display-change-01-b-ao.html fails after r94084.

Make sure that the trailing floats line box explicitly sets the line top with leading and line bottom with
leading to just be the block height.

Reviewed by Dan Bernstein.

* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::linkToEndLineIfNeeded):

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

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

index c953ce0..d14b7a6 100644 (file)
@@ -1,3 +1,17 @@
+2011-09-07  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=67286
+
+        REGRESSION: css2.1/t090204-display-change-01-b-ao.html fails after r94084.
+
+        Make sure that the trailing floats line box explicitly sets the line top with leading and line bottom with
+        leading to just be the block height.
+
+        Reviewed by Dan Bernstein.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::linkToEndLineIfNeeded):
+
 2011-09-06  Abhishek Arya  <inferno@chromium.org>
 
         Null owningRenderer crash in RenderScrollbar::updateScrollbarParts.
index 5af05d1..40a1414 100644 (file)
@@ -1168,8 +1168,9 @@ void RenderBlock::linkToEndLineIfNeeded(LineLayoutState& layoutState)
             trailingFloatsLineBox->setConstructed();
             GlyphOverflowAndFallbackFontsMap textBoxDataMap;
             VerticalPositionCache verticalPositionCache;
-            trailingFloatsLineBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, verticalPositionCache);
             int blockLogicalHeight = logicalHeight();
+            trailingFloatsLineBox->alignBoxesInBlockDirection(blockLogicalHeight, textBoxDataMap, verticalPositionCache);
+            trailingFloatsLineBox->setLineTopBottomPositions(blockLogicalHeight, blockLogicalHeight, blockLogicalHeight, blockLogicalHeight);
             IntRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLayoutOverflow - blockLogicalHeight);
             IntRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVisualOverflow - blockLogicalHeight);
             trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLineBox->lineBottom());