Changeset 140447 in webkit

Timestamp:

Jan 22, 2013, 12:03:44 PM (12 years ago)

Author:

tony@chromium.org

Message:

Merge r139337 to M25.

REGRESSION(r136967): margin-top + overflow:hidden causes incorrect layout for internal floated elements
​https://bugs.webkit.org/show_bug.cgi?id=106374

Reviewed by David Hyatt.

r136397 treated any self-collapsing block that had a clearance delta as though it was clearing a float, but
blocks that avoid floats can get a clearance delta too. So just ensure there is clearance on the block when deciding
whether we need to add the margin back in before placing the float.

TBR=​tony@chromium.org
Review URL: ​https://codereview.chromium.org/12039022

Location:

branches/chromium/1364

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child-expected.txt (copied) (copied from trunk/LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child-expected.txt )
• LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child.html (copied) (copied from trunk/LayoutTests/fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child.html )
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlockLineLayout.cpp (modified) (1 diff)

branches/chromium/1364/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-10  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r136967): margin-top + overflow:hidden causes incorrect layout for internal floated elements
+        https://bugs.webkit.org/show_bug.cgi?id=106374
+
+        Reviewed by David Hyatt.
+
+        * fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child-expected.txt: Added.
+        * fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child.html: Added.
+
 2013-01-09  Tien-Ren Chen  <trchen@chromium.org>
 

branches/chromium/1364/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-10  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r136967): margin-top + overflow:hidden causes incorrect layout for internal floated elements
+        https://bugs.webkit.org/show_bug.cgi?id=106374
+
+        Reviewed by David Hyatt.
+
+        r136397 treated any self-collapsing block that had a clearance delta as though it was clearing a float, but
+        blocks that avoid floats can get a clearance delta too. So just ensure there is clearance on the block when deciding
+        whether we need to add the margin back in before placing the float.
+
+        Test: fast/block/margin-collapse/self-collapsing-block-with-overflow-hidden-and-float-child.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):
+
 2013-01-09  Tien-Ren Chen  <trchen@chromium.org>
 

branches/chromium/1364/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2284 +2284 @@
             // The top margin edge of a self-collapsing block that clears a float intrudes up into it by the height of the margin,
             // so in order to place this child float at the top content edge of the self-collapsing block add the margin back in before placement.
-            LayoutUnit marginOffset = (m_block->isSelfCollapsingBlock() && m_block->getClearDelta(m_block, LayoutUnit())) ? m_block->collapsedMarginBeforeForChild(m_block) : LayoutUnit();
+            LayoutUnit marginOffset = (m_block->isSelfCollapsingBlock() && m_block->style()->clear() && m_block->getClearDelta(m_block, LayoutUnit())) ? m_block->collapsedMarginBeforeForChild(m_block) : LayoutUnit();
             LayoutUnit oldLogicalHeight = m_block->logicalHeight();
             m_block->setLogicalHeight(oldLogicalHeight + marginOffset);