Changeset 139337 in webkit

Timestamp:

Jan 10, 2013, 10:39:17 AM (12 years ago)

Author:

robert@webkit.org

Message:

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.

Source/WebCore:

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):

LayoutTests:

• 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.

Location:

trunk

Files:

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

trunk/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-10  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/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-10  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2285 +2285 @@
             // 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);