From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592) New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes --- Source/WebCore/rendering/RenderMultiColumnSet.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'Source/WebCore/rendering/RenderMultiColumnSet.cpp') diff --git a/Source/WebCore/rendering/RenderMultiColumnSet.cpp b/Source/WebCore/rendering/RenderMultiColumnSet.cpp index 83d1dea50..6412506cf 100644 --- a/Source/WebCore/rendering/RenderMultiColumnSet.cpp +++ b/Source/WebCore/rendering/RenderMultiColumnSet.cpp @@ -66,14 +66,23 @@ void RenderMultiColumnSet::updateLogicalWidth() void RenderMultiColumnSet::updateLogicalHeight() { + // FIXME: This is the only class that overrides updateLogicalHeight. If we didn't have to set computedColumnHeight, + // we could remove this and make updateLogicalHeight non-virtual. https://bugs.webkit.org/show_bug.cgi?id=96804 // Make sure our column height is up to date. - RenderMultiColumnBlock* parentBlock = toRenderMultiColumnBlock(parent()); - setComputedColumnHeight(parentBlock->columnHeight()); // FIXME: Once we make more than one column set, this will become variable. + LogicalExtentComputedValues computedValues; + computeLogicalHeight(0, 0, computedValues); + setComputedColumnHeight(computedValues.m_extent); // FIXME: Once we make more than one column set, this will become variable. // Our logical height is always just the height of our columns. setLogicalHeight(computedColumnHeight()); } +void RenderMultiColumnSet::computeLogicalHeight(LayoutUnit, LayoutUnit, LogicalExtentComputedValues& computedValues) const +{ + RenderMultiColumnBlock* parentBlock = toRenderMultiColumnBlock(parent()); + computedValues.m_extent = parentBlock->columnHeight(); +} + LayoutUnit RenderMultiColumnSet::columnGap() const { if (style()->hasNormalColumnGap()) -- cgit v1.2.1