Index: Source/core/rendering/RenderFlowThread.cpp |
diff --git a/Source/core/rendering/RenderFlowThread.cpp b/Source/core/rendering/RenderFlowThread.cpp |
index 7c8afe35ba9c1fcdb0b02375d6c2380a8b010a14..a2c02183483289ba21a1c400f1024380a69a56fc 100644 |
--- a/Source/core/rendering/RenderFlowThread.cpp |
+++ b/Source/core/rendering/RenderFlowThread.cpp |
@@ -66,7 +66,6 @@ void RenderFlowThread::invalidateRegions() |
return; |
} |
- m_multiColumnSetRangeMap.clear(); |
setNeedsLayoutAndFullPaintInvalidation(); |
m_regionsInvalidated = true; |
@@ -216,42 +215,6 @@ RenderRegion* RenderFlowThread::lastRegion() const |
return m_multiColumnSetList.last(); |
} |
-void RenderFlowThread::setRegionRangeForBox(const RenderBox* box, LayoutUnit offsetFromLogicalTopOfFirstPage) |
-{ |
- if (!hasRegions()) |
- return; |
- |
- // FIXME: Not right for differing writing-modes. |
- RenderMultiColumnSet* startColumnSet = columnSetAtBlockOffset(offsetFromLogicalTopOfFirstPage); |
- RenderMultiColumnSet* endColumnSet = columnSetAtBlockOffset(offsetFromLogicalTopOfFirstPage + box->logicalHeight()); |
- RenderMultiColumnSetRangeMap::iterator it = m_multiColumnSetRangeMap.find(box); |
- if (it == m_multiColumnSetRangeMap.end()) { |
- m_multiColumnSetRangeMap.set(box, RenderMultiColumnSetRange(startColumnSet, endColumnSet)); |
- return; |
- } |
- |
- // If nothing changed, just bail. |
- RenderMultiColumnSetRange& range = it->value; |
- if (range.startColumnSet() == startColumnSet && range.endColumnSet() == endColumnSet) |
- return; |
- |
- range.setRange(startColumnSet, endColumnSet); |
-} |
- |
-void RenderFlowThread::getRegionRangeForBox(const RenderBox* box, RenderMultiColumnSet*& startColumnSet, RenderMultiColumnSet*& endColumnSet) const |
-{ |
- startColumnSet = 0; |
- endColumnSet = 0; |
- RenderMultiColumnSetRangeMap::const_iterator it = m_multiColumnSetRangeMap.find(box); |
- if (it == m_multiColumnSetRangeMap.end()) |
- return; |
- |
- const RenderMultiColumnSetRange& range = it->value; |
- startColumnSet = range.startColumnSet(); |
- endColumnSet = range.endColumnSet(); |
- ASSERT(m_multiColumnSetList.contains(startColumnSet) && m_multiColumnSetList.contains(endColumnSet)); |
-} |
- |
void RenderFlowThread::updateRegionsFlowThreadPortionRect() |
{ |
LayoutUnit logicalHeight = 0; |