Remove column set range map from RenderFlowThread.

Source/core/rendering/RenderFlowThread.cpp

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 48 matching lines @@
     m_multiColumnSetList.remove(columnSet);
 }
 
 void RenderFlowThread::invalidateRegions()
 {
     if (m_regionsInvalidated) {
         ASSERT(selfNeedsLayout());
         return;
     }
 
-    m_multiColumnSetRangeMap.clear();
     setNeedsLayoutAndFullPaintInvalidation();
 
     m_regionsInvalidated = true;
 }
 
 class CurrentRenderFlowThreadDisabler {
     WTF_MAKE_NONCOPYABLE(CurrentRenderFlowThreadDisabler);
 public:
     CurrentRenderFlowThreadDisabler(RenderView* view)
         : m_view(view)
@@ skipping 129 matching lines @@
     return m_multiColumnSetList.first();
 }
 
 RenderRegion* RenderFlowThread::lastRegion() const
 {
     if (!hasValidRegionInfo())
         return 0;
     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;
     // FIXME: Optimize not to clear the interval all the time. This implies manually managing the tree nodes lifecycle.
     m_multiColumnSetIntervalTree.clear();
     m_multiColumnSetIntervalTree.initIfNeeded();
     for (RenderMultiColumnSetList::iterator iter = m_multiColumnSetList.begin(); iter != m_multiColumnSetList.end(); ++iter) {
         RenderMultiColumnSet* columnSet = *iter;
 
         LayoutUnit columnSetLogicalWidth = columnSet->pageLogicalWidth();
@@ skipping 163 matching lines @@
 {
     if (!m_renderFlowThread)
         return;
     RenderView* view = m_renderFlowThread->view();
     ASSERT(view->flowThreadController()->currentRenderFlowThread() == m_renderFlowThread);
     view->flowThreadController()->setCurrentRenderFlowThread(m_previousRenderFlowThread);
 }
 
 
 } // namespace blink