Index: Source/core/rendering/RenderBlock.cpp |
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp |
index 7f910a1637cee7496dfa34452b8962f4fc2faac5..abb233928b895b4640c1ef855e7c1026aa9d98ed 100644 |
--- a/Source/core/rendering/RenderBlock.cpp |
+++ b/Source/core/rendering/RenderBlock.cpp |
@@ -1498,38 +1498,6 @@ bool RenderBlock::updateLogicalWidthAndColumnWidth() |
return oldWidth != logicalWidth() || oldColumnWidth != desiredColumnWidth() || hasBorderOrPaddingLogicalWidthChanged; |
} |
-void RenderBlock::checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) |
-{ |
- ColumnInfo* colInfo = columnInfo(); |
- if (hasColumns()) { |
- if (!pageLogicalHeight) { |
- LayoutUnit oldLogicalHeight = logicalHeight(); |
- setLogicalHeight(0); |
- // We need to go ahead and set our explicit page height if one exists, so that we can |
- // avoid doing two layout passes. |
- updateLogicalHeight(); |
- LayoutUnit columnHeight = contentLogicalHeight(); |
- if (columnHeight > 0) { |
- pageLogicalHeight = columnHeight; |
- hasSpecifiedPageLogicalHeight = true; |
- } |
- setLogicalHeight(oldLogicalHeight); |
- } |
- if (colInfo->columnHeight() != pageLogicalHeight && everHadLayout()) { |
- colInfo->setColumnHeight(pageLogicalHeight); |
- pageLogicalHeightChanged = true; |
- } |
- |
- if (!hasSpecifiedPageLogicalHeight && !pageLogicalHeight) |
- colInfo->clearForcedBreaks(); |
- |
- colInfo->setPaginationUnit(paginationUnit()); |
- } else if (isRenderFlowThread()) { |
- pageLogicalHeight = 1; // This is just a hack to always make sure we have a page logical height. |
- pageLogicalHeightChanged = toRenderFlowThread(this)->pageLogicalSizeChanged(); |
- } |
-} |
- |
void RenderBlock::layoutBlock(bool) |
{ |
ASSERT_NOT_REACHED(); |