Changeset 83514 in webkit

Timestamp:

Apr 11, 2011 3:16:02 PM (13 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=58261

Reviewed by Dan Bernstein.

Fix for layout regression on marketwatch.com. When I converted TrailingFloatsRootInlineBox over
to the new overflow model, I messed up the math and passed a bottom value where I should have
passed a height value. This patch fixes the code to be logically equivalent to the way it
was prior to my changes.

Source/WebCore:

Added fast/overflow/trailing-float-linebox.html.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::layoutInlineChildren):

LayoutTests:

• fast/overflow/trailing-float-linebox.html: Added.
• platform/mac/fast/overflow/trailing-float-linebox-expected.checksum: Added.
• platform/mac/fast/overflow/trailing-float-linebox-expected.png: Added.
• platform/mac/fast/overflow/trailing-float-linebox-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/trailing-float-linebox.html (added)
• LayoutTests/platform/mac/fast/overflow/trailing-float-linebox-expected.checksum (added)
• LayoutTests/platform/mac/fast/overflow/trailing-float-linebox-expected.png (added)
• LayoutTests/platform/mac/fast/overflow/trailing-float-linebox-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-11  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58261
+
+        Fix for layout regression on marketwatch.com. When I converted TrailingFloatsRootInlineBox over
+        to the new overflow model, I messed up the math and passed a bottom value where I should have
+        passed a height value. This patch fixes the code to be logically equivalent to the way it
+        was prior to my changes.
+
+        * fast/overflow/trailing-float-linebox.html: Added.
+        * platform/mac/fast/overflow/trailing-float-linebox-expected.checksum: Added.
+        * platform/mac/fast/overflow/trailing-float-linebox-expected.png: Added.
+        * platform/mac/fast/overflow/trailing-float-linebox-expected.txt: Added.
+
 2011-04-11  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-11  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=58261
+
+        Fix for layout regression on marketwatch.com. When I converted TrailingFloatsRootInlineBox over
+        to the new overflow model, I messed up the math and passed a bottom value where I should have
+        passed a height value. This patch fixes the code to be logically equivalent to the way it
+        was prior to my changes.
+
+        Added fast/overflow/trailing-float-linebox.html.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::layoutInlineChildren):
+
 2011-04-11  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1065 +1065 @@
                 VerticalPositionCache verticalPositionCache;
                 trailingFloatsLineBox->alignBoxesInBlockDirection(logicalHeight(), textBoxDataMap, verticalPositionCache);
-                IntRect logicalLayoutOverflow(0, logicalHeight(), 1, bottomLayoutOverflow);
-                IntRect logicalVisualOverflow(0, logicalHeight(), 1, bottomVisualOverflow);
+                int blockLogicalHeight = logicalHeight();
+                IntRect logicalLayoutOverflow(0, blockLogicalHeight, 1, bottomLayoutOverflow - blockLogicalHeight);
+                IntRect logicalVisualOverflow(0, blockLogicalHeight, 1, bottomVisualOverflow - blockLogicalHeight);
                 trailingFloatsLineBox->setOverflowFromLogicalRects(logicalLayoutOverflow, logicalVisualOverflow, trailingFloatsLineBox->lineTop(), trailingFloatsLineBox->lineBottom());
                 trailingFloatsLineBox->setBlockLogicalHeight(logicalHeight());