| Index: Source/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
|
| index 0d371aa66d299744b416c0eaf228cff9323deac4..67b372353db551a73dc2b66ed3502167523d803d 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.cpp
|
| +++ b/Source/core/rendering/RenderBlockFlow.cpp
|
| @@ -1754,16 +1754,14 @@ LayoutUnit RenderBlockFlow::applyAfterBreak(RenderBox& child, LayoutUnit logical
|
| bool checkAfterAlways = (checkColumnBreaks && child.style()->columnBreakAfter() == PBALWAYS)
|
| || (checkPageBreaks && child.style()->pageBreakAfter() == PBALWAYS);
|
| if (checkAfterAlways && inNormalFlow(&child)) {
|
| - LayoutUnit marginOffset = marginInfo.canCollapseWithMarginBefore() ? LayoutUnit() : marginInfo.margin();
|
| -
|
| // So our margin doesn't participate in the next collapsing steps.
|
| marginInfo.clearMargin();
|
|
|
| if (checkColumnBreaks) {
|
| if (isInsideMulticolFlowThread) {
|
| LayoutUnit offsetBreakAdjustment = 0;
|
| - if (flowThread->addForcedRegionBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset + marginOffset, &child, false, &offsetBreakAdjustment))
|
| - return logicalOffset + marginOffset + offsetBreakAdjustment;
|
| + if (flowThread->addForcedRegionBreak(offsetFromLogicalTopOfFirstPage() + logicalOffset, &child, false, &offsetBreakAdjustment))
|
| + return logicalOffset + offsetBreakAdjustment;
|
| } else {
|
| view()->layoutState()->addForcedColumnBreak(child, logicalOffset);
|
| }
|
|
|