| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 87e0beedb05291c078147aa406c6a8ed9d16d69e..ea6b32d68aeeeb65538c72e15da4f3d24d3a60e0 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -4612,12 +4612,6 @@ LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit
|
| return logicalOffset;
|
| }
|
|
|
| -bool RenderBlock::pushToNextPageWithMinimumLogicalHeight(LayoutUnit& adjustment, LayoutUnit logicalOffset, LayoutUnit minimumLogicalHeight) const
|
| -{
|
| - // FIXME: multicol will need to do some work here, when we implement support for multiple rows.
|
| - return false;
|
| -}
|
| -
|
| void RenderBlock::setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage)
|
| {
|
| if (RenderFlowThread* flowThread = flowThreadContainingBlock())
|
| @@ -4695,9 +4689,6 @@ void RenderBlock::adjustLinePositionForPagination(RootInlineBox* lineBox, Layout
|
| clearShouldBreakAtLineToAvoidWidow();
|
| setDidBreakAtLineToAvoidWidow();
|
| }
|
| - // If we have a non-uniform page height, then we have to shift further possibly.
|
| - if (!hasUniformPageLogicalHeight && !pushToNextPageWithMinimumLogicalHeight(remainingLogicalHeight, logicalOffset, lineHeight))
|
| - return;
|
| if (lineHeight > pageLogicalHeight) {
|
| // Split the top margin in order to avoid splitting the visible part of the line.
|
| remainingLogicalHeight -= min(lineHeight - pageLogicalHeight, max<LayoutUnit>(0, logicalVisualOverflow.y() - lineBox->lineTopWithLeading()));
|
|
|