Replace collectLayerFragments() with FragmentainerIterator.

third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h

Index: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
diff --git a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
index b7d44d482ed085b9f6c6d00a3fddd7bf08c8c7b2..f49b93e6ddfd7331e2181157cadb94242804cc74 100644
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
@@ -67,7 +67,15 @@ public:
     LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) const;
     LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) const;
 
-    void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) const;
+    LayoutRect flowThreadPortionOverflowRectAt(unsigned columnIndex) const;
+
+    // Get the first and the last column intersecting the specified block range.
+    // Note that |logicalBottomInFlowThread| is an exclusive endpoint.
+    void columnIntervalForBlockRangeInFlowThread(LayoutUnit logicalTopInFlowThread, LayoutUnit logicalBottomInFlowThread, unsigned& firstColumn, unsigned& lastColumn) const;
+
+    // Get the first and the last column intersecting the specified visual rectangle.
+    void columnIntervalForVisualRect(const LayoutRect&, unsigned& firstColumn, unsigned& lastColumn) const;
+
     LayoutRect calculateOverflow() const;
 
     enum ColumnIndexCalculationMode {
@@ -89,20 +97,12 @@ private:
     LayoutRect columnRectAt(unsigned columnIndex) const;
     LayoutUnit logicalTopInFlowThreadAt(unsigned columnIndex) const { return m_logicalTopInFlowThread + columnIndex * m_columnHeight; }
     LayoutRect flowThreadPortionRectAt(unsigned columnIndex) const;
-    LayoutRect flowThreadPortionOverflowRectAt(unsigned columnIndex) const;
 
     // Return the column that the specified visual point belongs to. Only the coordinate on the
     // column progression axis is relevant. Every point belongs to a column, even if said point is
     // not inside any of the columns.
     unsigned columnIndexAtVisualPoint(const LayoutPoint& visualPoint) const;
 
-    // Get the first and the last column intersecting the specified block range.
-    // Note that |logicalBottomInFlowThread| is an exclusive endpoint.
-    void columnIntervalForBlockRangeInFlowThread(LayoutUnit logicalTopInFlowThread, LayoutUnit logicalBottomInFlowThread, unsigned& firstColumn, unsigned& lastColumn) const;
-
-    // Get the first and the last column intersecting the specified visual rectangle.
-    void columnIntervalForVisualRect(const LayoutRect&, unsigned& firstColumn, unsigned& lastColumn) const;
-
     const LayoutMultiColumnSet& m_columnSet;
 
     LayoutUnit m_logicalTop;