Chromium Code Reviews| Index: Source/core/rendering/RenderFlowThread.cpp |
| diff --git a/Source/core/rendering/RenderFlowThread.cpp b/Source/core/rendering/RenderFlowThread.cpp |
| index a2c02183483289ba21a1c400f1024380a69a56fc..4bfa5870d6bb75cf257aea2e905a7e07211e8b06 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); |
| @@ -368,14 +368,6 @@ LayoutUnit RenderFlowThread::offsetFromLogicalTopOfFirstRegion(const RenderBlock |
| return currentBlock->isHorizontalWritingMode() ? blockRect.y() : blockRect.x(); |
| } |
| -void RenderFlowThread::RegionSearchAdapter::collectIfNeeded(const MultiColumnSetInterval& interval) |
|
mstensho (USE GERRIT)
2014/10/02 07:15:17
Still need this.
|
| -{ |
| - if (m_result) |
| - return; |
| - if (interval.low() <= m_offset && interval.high() > m_offset) |
| - m_result = interval.data(); |
| -} |
| - |
| CurrentRenderFlowThreadMaintainer::CurrentRenderFlowThreadMaintainer(RenderFlowThread* renderFlowThread) |
| : m_renderFlowThread(renderFlowThread) |
| , m_previousRenderFlowThread(0) |