| Index: Source/core/rendering/RenderFlowThread.cpp
|
| diff --git a/Source/core/rendering/RenderFlowThread.cpp b/Source/core/rendering/RenderFlowThread.cpp
|
| index a2c02183483289ba21a1c400f1024380a69a56fc..0d69b0da6dff7a9d0ab86429c434897b16c8890c 100644
|
| --- a/Source/core/rendering/RenderFlowThread.cpp
|
| +++ b/Source/core/rendering/RenderFlowThread.cpp
|
| @@ -139,7 +139,7 @@ void RenderFlowThread::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, L
|
|
|
| for (RenderMultiColumnSetList::const_iterator iter = m_multiColumnSetList.begin(); iter != m_multiColumnSetList.end(); ++iter) {
|
| RenderMultiColumnSet* columnSet = *iter;
|
| - computedValues.m_extent += columnSet->logicalHeightOfAllFlowThreadContent();
|
| + computedValues.m_extent += columnSet->logicalHeightInFlowThread();
|
| }
|
| }
|
|
|
| @@ -225,7 +225,7 @@ void RenderFlowThread::updateRegionsFlowThreadPortionRect()
|
| RenderMultiColumnSet* columnSet = *iter;
|
|
|
| LayoutUnit columnSetLogicalWidth = columnSet->pageLogicalWidth();
|
| - LayoutUnit columnSetLogicalHeight = std::min<LayoutUnit>(RenderFlowThread::maxLogicalHeight() - logicalHeight, columnSet->logicalHeightOfAllFlowThreadContent());
|
| + LayoutUnit columnSetLogicalHeight = std::min<LayoutUnit>(RenderFlowThread::maxLogicalHeight() - logicalHeight, columnSet->logicalHeightInFlowThread());
|
|
|
| LayoutRect columnSetRect(style()->direction() == LTR ? LayoutUnit() : logicalWidth() - columnSetLogicalWidth, logicalHeight, columnSetLogicalWidth, columnSetLogicalHeight);
|
|
|
|
|