Changeset 142659 in webkit

Timestamp:

Feb 12, 2013 1:06:07 PM (11 years ago)

Author:

robert@webkit.org

Message:

REGRESSION(r136967): Combination of float and clear yields to bad layout
​https://bugs.webkit.org/show_bug.cgi?id=109476

Reviewed by Levi Weintraub.

Source/WebCore:

Test: fast/block/margin-collapse/self-collapsing-block-with-float-children.html

The change made at ​http://trac.webkit.org/changeset/136967 only needs to worry about the first floated
child of a self-collapsing block. The ones that follow are not affected by its margins.

• rendering/RenderBlockLineLayout.cpp:

(WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):

LayoutTests:

• fast/block/margin-collapse/self-collapsing-block-with-float-children-expected.txt: Added.
• fast/block/margin-collapse/self-collapsing-block-with-float-children.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-12  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r136967): Combination of float and clear yields to bad layout
+        https://bugs.webkit.org/show_bug.cgi?id=109476
+
+        Reviewed by Levi Weintraub.
+
+        * fast/block/margin-collapse/self-collapsing-block-with-float-children-expected.txt: Added.
+        * fast/block/margin-collapse/self-collapsing-block-with-float-children.html: Added.
+
 2013-02-12  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-12  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r136967): Combination of float and clear yields to bad layout
+        https://bugs.webkit.org/show_bug.cgi?id=109476
+
+        Reviewed by Levi Weintraub.
+
+        Test: fast/block/margin-collapse/self-collapsing-block-with-float-children.html
+
+        The change made at http://trac.webkit.org/changeset/136967 only needs to worry about the first floated
+        child of a self-collapsing block. The ones that follow are not affected by its margins.
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):
+
 2013-02-12  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2282 +2282 @@
         } else if (object->isFloating()) {
             // 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->style()->clear() && m_block->getClearDelta(m_block, LayoutUnit())) ? m_block->collapsedMarginBeforeForChild(m_block) : LayoutUnit();
+            // so in order to place this first child float at the top content edge of the self-collapsing block add the margin back in before placement.
+            LayoutUnit marginOffset = (!object->previousSibling() && 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);