Index: third_party/WebKit/Source/core/layout/LayoutBlock.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp |
index 375d4a4277ba5116d997db3195fd9481a189da6f..037666e6e582f9223829de8a5e21e91e361431ef 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBlock.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBlock.cpp |
@@ -2568,57 +2568,6 @@ LayoutUnit LayoutBlock::nextPageLogicalTop(LayoutUnit logicalOffset, PageBoundar |
return logicalOffset + pageRemainingLogicalHeightForOffset(logicalOffset, pageBoundaryRule); |
} |
-LayoutUnit LayoutBlock::pageLogicalHeightForOffset(LayoutUnit offset) const |
-{ |
- LayoutView* layoutView = view(); |
- LayoutFlowThread* flowThread = flowThreadContainingBlock(); |
- if (!flowThread) |
- return layoutView->layoutState()->pageLogicalHeight(); |
- return flowThread->pageLogicalHeightForOffset(offset + offsetFromLogicalTopOfFirstPage()); |
-} |
- |
-LayoutUnit LayoutBlock::pageRemainingLogicalHeightForOffset(LayoutUnit offset, PageBoundaryRule pageBoundaryRule) const |
-{ |
- LayoutView* layoutView = view(); |
- offset += offsetFromLogicalTopOfFirstPage(); |
- |
- LayoutFlowThread* flowThread = flowThreadContainingBlock(); |
- if (!flowThread) { |
- LayoutUnit pageLogicalHeight = layoutView->layoutState()->pageLogicalHeight(); |
- LayoutUnit remainingHeight = pageLogicalHeight - intMod(offset, pageLogicalHeight); |
- if (pageBoundaryRule == AssociateWithFormerPage) { |
- // An offset exactly at a page boundary will act as being part of the former page in |
- // question (i.e. no remaining space), rather than being part of the latter (i.e. one |
- // whole page length of remaining space). |
- remainingHeight = intMod(remainingHeight, pageLogicalHeight); |
- } |
- return remainingHeight; |
- } |
- |
- return flowThread->pageRemainingLogicalHeightForOffset(offset, pageBoundaryRule); |
-} |
- |
-LayoutUnit LayoutBlock::calculatePaginationStrutToFitContent(LayoutUnit offset, LayoutUnit strutToNextPage, LayoutUnit contentLogicalHeight) const |
-{ |
- ASSERT(strutToNextPage == pageRemainingLogicalHeightForOffset(offset, AssociateWithLatterPage)); |
- LayoutUnit nextPageLogicalTop = offset + strutToNextPage; |
- if (pageLogicalHeightForOffset(nextPageLogicalTop) >= contentLogicalHeight) |
- return strutToNextPage; // Content fits just fine in the next page or column. |
- |
- // Moving to the top of the next page or column doesn't result in enough space for the content |
- // that we're trying to fit. If we're in a nested fragmentation context, we may find enough |
- // space if we move to a column further ahead, by effectively breaking to the next outer |
- // fragmentainer. |
- LayoutFlowThread* flowThread = flowThreadContainingBlock(); |
- if (!flowThread) { |
- // If there's no flow thread, we're not nested. All pages have the same height. Give up. |
- return strutToNextPage; |
- } |
- // Start searching for a suitable offset at the top of the next page or column. |
- LayoutUnit flowThreadOffset = offsetFromLogicalTopOfFirstPage() + nextPageLogicalTop; |
- return strutToNextPage + flowThread->nextLogicalTopForUnbreakableContent(flowThreadOffset, contentLogicalHeight) - flowThreadOffset; |
-} |
- |
void LayoutBlock::paginatedContentWasLaidOut(LayoutUnit logicalBottomOffsetAfterPagination) |
{ |
if (LayoutFlowThread* flowThread = flowThreadContainingBlock()) |