diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderMultiColumnBlock.cpp')
-rw-r--r-- | Source/WebCore/rendering/RenderMultiColumnBlock.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Source/WebCore/rendering/RenderMultiColumnBlock.cpp b/Source/WebCore/rendering/RenderMultiColumnBlock.cpp index 9f6bdefb4..64271a329 100644 --- a/Source/WebCore/rendering/RenderMultiColumnBlock.cpp +++ b/Source/WebCore/rendering/RenderMultiColumnBlock.cpp @@ -78,23 +78,19 @@ bool RenderMultiColumnBlock::recomputeLogicalWidth() return relayoutChildren; } -void RenderMultiColumnBlock::checkForPaginationLogicalHeightChange(LayoutUnit& pageLogicalHeight, bool& pageLogicalHeightChanged, bool& hasSpecifiedPageLogicalHeight) +void RenderMultiColumnBlock::checkForPaginationLogicalHeightChange(LayoutUnit& /*pageLogicalHeight*/, bool& /*pageLogicalHeightChanged*/, bool& /*hasSpecifiedPageLogicalHeight*/) { - // We need to go ahead and set our explicit page height if one exists, so that we can - // avoid doing multiple layout passes. + // We don't actually update any of the variables. We just subclassed to adjust our column height. computeLogicalHeight(); LayoutUnit newContentLogicalHeight = contentLogicalHeight(); if (newContentLogicalHeight > ZERO_LAYOUT_UNIT) { - pageLogicalHeight = newContentLogicalHeight; - hasSpecifiedPageLogicalHeight = true; + // The regions will be invalidated when we lay them out and they change size to + // the new column height. + if (columnHeight() != newContentLogicalHeight) + setColumnHeight(newContentLogicalHeight); } setLogicalHeight(ZERO_LAYOUT_UNIT); - if (columnHeight() != pageLogicalHeight && everHadLayout()) { - setColumnHeight(pageLogicalHeight); - pageLogicalHeightChanged = true; - } - // Set up our column sets. ensureColumnSets(); } |