| Index: Source/core/rendering/RenderBlockFlow.cpp
|
| diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
|
| index 8a4f224b3df5663e1a5a323024160c2b4bd0edd9..6e47cf28e2bc9522139a46e6388e48e4e56b2625 100644
|
| --- a/Source/core/rendering/RenderBlockFlow.cpp
|
| +++ b/Source/core/rendering/RenderBlockFlow.cpp
|
| @@ -221,7 +221,7 @@ bool RenderBlockFlow::relayoutForPagination(bool hasSpecifiedPageLogicalHeight,
|
| if (columnHeight && columnHeight != pageLogicalHeight) {
|
| statePusher.pop();
|
| setEverHadLayout(true);
|
| - layoutBlock(false, columnHeight);
|
| + layoutBlockFlow(false, columnHeight);
|
| return true;
|
| }
|
| }
|
| @@ -245,7 +245,12 @@ bool RenderBlockFlow::isSelfCollapsingBlock() const
|
| return m_hasOnlySelfCollapsingChildren;
|
| }
|
|
|
| -void RenderBlockFlow::layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight)
|
| +void RenderBlockFlow::layoutBlock(bool relayoutChildren)
|
| +{
|
| + layoutBlockFlow(relayoutChildren);
|
| +}
|
| +
|
| +void RenderBlockFlow::layoutBlockFlow(bool relayoutChildren, LayoutUnit pageLogicalHeight)
|
| {
|
| ASSERT(needsLayout());
|
| ASSERT(isInlineBlockOrInlineTable() || !isInline());
|
|
|