Changeset 136967 in webkit

Timestamp:

Dec 7, 2012 11:30:51 AM (11 years ago)

Author:

robert@webkit.org

Message:

REGRESSION(r127163): Content is offset to the right at rea.ru
​https://bugs.webkit.org/show_bug.cgi?id=103116

Reviewed by David Hyatt.

Source/WebCore:

The top margin edge of a self-collapsing block that clears a float intrudes up into it by the height of the margin,
so to ensure any child floats of the self-collapsing block only go as far as the top content edge
add the margin back in to the block's current height before placing them.

Tests: fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins.html

fast/block/margin-collapse/self-collapsing-block-with-float-child.html

• rendering/RenderBlockLineLayout.cpp:

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

LayoutTests:

• fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins-expected.html: Added.
• fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins.html: Added.
• fast/block/margin-collapse/self-collapsing-block-with-float-child-expected.html: Added.
• fast/block/margin-collapse/self-collapsing-block-with-float-child.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-07  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r127163): Content is offset to the right at rea.ru
+        https://bugs.webkit.org/show_bug.cgi?id=103116
+
+        Reviewed by David Hyatt.
+
+        * fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins-expected.html: Added.
+        * fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins.html: Added.
+        * fast/block/margin-collapse/self-collapsing-block-with-float-child-expected.html: Added.
+        * fast/block/margin-collapse/self-collapsing-block-with-float-child.html: Added.
+
 2012-12-07  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-07  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r127163): Content is offset to the right at rea.ru
+        https://bugs.webkit.org/show_bug.cgi?id=103116
+
+        Reviewed by David Hyatt.
+
+        The top margin edge of a self-collapsing block that clears a float intrudes up into it by the height of the margin,
+        so to ensure any child floats of the self-collapsing block only go as far as the top content edge 
+        add the margin back in to the block's current height before placing them.
+
+        Tests: fast/block/margin-collapse/self-collapsing-block-with-float-child-collapsed-margins.html
+               fast/block/margin-collapse/self-collapsing-block-with-float-child.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):
+
 2012-12-07  Alexis Menard  <alexis@webkit.org>
 

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -2214 +2214 @@
                 lineInfo.incrementRunsFromLeadingWhitespace();
             }
-        } else if (object->isFloating())
+        } 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->getClearDelta(m_block, LayoutUnit())) ? m_block->collapsedMarginBeforeForChild(m_block) : LayoutUnit();
+            LayoutUnit oldLogicalHeight = m_block->logicalHeight();
+            m_block->setLogicalHeight(oldLogicalHeight + marginOffset);
             m_block->positionNewFloatOnLine(m_block->insertFloatingObject(toRenderBox(object)), lastFloatFromPreviousLine, lineInfo, width);
-        else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText() && !toRenderCombineText(object)->isCombined()) {
+            m_block->setLogicalHeight(oldLogicalHeight);
+        } else if (object->isText() && object->style()->hasTextCombine() && object->isCombineText() && !toRenderCombineText(object)->isCombined()) {
             toRenderCombineText(object)->combineText();
             if (toRenderCombineText(object)->isCombined())