Changeset 144178 in webkit

Timestamp:

Feb 27, 2013 6:50:21 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] Region overset property is not properly computed when there is a region break
​https://bugs.webkit.org/show_bug.cgi?id=92497

Patch by Mihai Maerean <Mihai Maerean> on 2013-02-27
Reviewed by David Hyatt.

Source/WebCore:

For "paginated" content in regions that has -webkit-region-break-after:always, the bottom margin was being passed
along for the next region in the chain, which shouldn't happen.

The fix is, at layout, to clear the bottom margin for the nodes (inside paginated contexts) that have
-webkit-region-break-after:always.

Tests: fast/multicol/break-after-always-bottom-margin.html

fast/regions/overset-break-nested.html
fast/regions/overset-break-with-sibling.html
fast/regions/overset-break.html

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::applyAfterBreak):

LayoutTests:

• fast/multicol/break-after-always-bottom-margin-expected.txt: Added.
• fast/multicol/break-after-always-bottom-margin.html: Added.
• fast/regions/overset-break-expected.txt: Added.
• fast/regions/overset-break-nested-expected.txt: Added.
• fast/regions/overset-break-nested.html: Added.
• fast/regions/overset-break-with-sibling-expected.txt: Added.
• fast/regions/overset-break-with-sibling.html: Added.
• fast/regions/overset-break.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/break-after-always-bottom-margin-expected.txt (added)
• LayoutTests/fast/multicol/break-after-always-bottom-margin.html (added)
• LayoutTests/fast/regions/overset-break-expected.txt (added)
• LayoutTests/fast/regions/overset-break-nested-expected.txt (added)
• LayoutTests/fast/regions/overset-break-nested.html (added)
• LayoutTests/fast/regions/overset-break-with-sibling-expected.txt (added)
• LayoutTests/fast/regions/overset-break-with-sibling.html (added)
• LayoutTests/fast/regions/overset-break.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-27  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Region overset property is not properly computed when there is a region break
+        https://bugs.webkit.org/show_bug.cgi?id=92497
+
+        Reviewed by David Hyatt.
+
+        * fast/multicol/break-after-always-bottom-margin-expected.txt: Added.
+        * fast/multicol/break-after-always-bottom-margin.html: Added.
+        * fast/regions/overset-break-expected.txt: Added.
+        * fast/regions/overset-break-nested-expected.txt: Added.
+        * fast/regions/overset-break-nested.html: Added.
+        * fast/regions/overset-break-with-sibling-expected.txt: Added.
+        * fast/regions/overset-break-with-sibling.html: Added.
+        * fast/regions/overset-break.html: Added.
+
 2013-02-27  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-27  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Region overset property is not properly computed when there is a region break
+        https://bugs.webkit.org/show_bug.cgi?id=92497
+
+        Reviewed by David Hyatt.
+
+        For "paginated" content in regions that has -webkit-region-break-after:always, the bottom margin was being passed
+        along for the next region in the chain, which shouldn't happen.
+
+        The fix is, at layout, to clear the bottom margin for the nodes (inside paginated contexts) that have
+        -webkit-region-break-after:always.
+
+        Tests: fast/multicol/break-after-always-bottom-margin.html
+               fast/regions/overset-break-nested.html
+               fast/regions/overset-break-with-sibling.html
+               fast/regions/overset-break.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::applyAfterBreak):
+
 2013-02-27  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -7249 +7249 @@
                             || (checkRegionBreaks && child->style()->regionBreakAfter() == PBALWAYS);
     if (checkAfterAlways && inNormalFlow(child) && hasNextPage(logicalOffset, IncludePageBoundary)) {
-        marginInfo.setMarginAfterQuirk(true); // Cause margins to be discarded for any following content.
+        LayoutUnit marginOffset = marginInfo.canCollapseWithMarginBefore() ? LayoutUnit() : marginInfo.margin();
+
+        // So our margin doesn't participate in the next collapsing steps.
+        marginInfo.clearMargin();
+
         if (checkColumnBreaks)
             view()->layoutState()->addForcedColumnBreak(child, logicalOffset);
         if (checkRegionBreaks) {
-            LayoutUnit marginOffset = marginInfo.canCollapseWithMarginBefore() ? LayoutUnit() : marginInfo.margin();
             LayoutUnit offsetBreakAdjustment = 0;
             if (enclosingRenderFlowThread()->addForcedRegionBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset + marginOffset, child, false, &offsetBreakAdjustment))