| Index: Source/core/rendering/RenderBlock.cpp
|
| diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
|
| index 9336cc6fbeec17527009af76124585cd949234e9..5a4baccfd4a7de3eb22106c2d8c8a10165031ba2 100644
|
| --- a/Source/core/rendering/RenderBlock.cpp
|
| +++ b/Source/core/rendering/RenderBlock.cpp
|
| @@ -4514,25 +4514,6 @@ LayoutUnit RenderBlock::pageRemainingLogicalHeightForOffset(LayoutUnit offset, P
|
| return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryRule);
|
| }
|
|
|
| -LayoutUnit RenderBlock::adjustForUnsplittableChild(RenderBox* child, LayoutUnit logicalOffset, bool includeMargins)
|
| -{
|
| - bool checkColumnBreaks = view()->layoutState()->isPaginatingColumns() || flowThreadContainingBlock();
|
| - bool checkPageBreaks = !checkColumnBreaks && view()->layoutState()->pageLogicalHeight();
|
| - bool isUnsplittable = child->isUnsplittableForPagination() || (checkColumnBreaks && child->style()->columnBreakInside() == PBAVOID)
|
| - || (checkPageBreaks && child->style()->pageBreakInside() == PBAVOID);
|
| - if (!isUnsplittable)
|
| - return logicalOffset;
|
| - LayoutUnit childLogicalHeight = logicalHeightForChild(child) + (includeMargins ? marginBeforeForChild(child) + marginAfterForChild(child) : LayoutUnit());
|
| - LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(logicalOffset);
|
| - updateMinimumPageHeight(logicalOffset, childLogicalHeight);
|
| - if (!pageLogicalHeight || childLogicalHeight > pageLogicalHeight)
|
| - return logicalOffset;
|
| - LayoutUnit remainingLogicalHeight = pageRemainingLogicalHeightForOffset(logicalOffset, ExcludePageBoundary);
|
| - if (remainingLogicalHeight < childLogicalHeight)
|
| - return logicalOffset + remainingLogicalHeight;
|
| - return logicalOffset;
|
| -}
|
| -
|
| void RenderBlock::setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage)
|
| {
|
| if (RenderFlowThread* flowThread = flowThreadContainingBlock())
|
|
|