Replace collectLayerFragments() with FragmentainerIterator.

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

 /*
  * Copyright (C) 2012 Apple Inc.  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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 46 matching lines @@
 // is inside another fragmentation context (e.g. paged media, or an another multicol container), we
 // may need to group the columns, so that we get one MultiColumnFragmentainerGroup for each outer
 // fragmentainer (page / column) that the inner multicol container lives in. Each fragmentainer
 // group has its own column height, but the column height is uniform within a group.
 class CORE_EXPORT LayoutMultiColumnSet : public LayoutBlockFlow {
 public:
     static LayoutMultiColumnSet* createAnonymous(LayoutFlowThread&, const ComputedStyle& parentStyle);
 
     const MultiColumnFragmentainerGroup& firstFragmentainerGroup() const { return m_fragmentainerGroups.first(); }
     const MultiColumnFragmentainerGroup& lastFragmentainerGroup() const { return m_fragmentainerGroups.last(); }
+    unsigned fragmentainerGroupIndexAtFlowThreadOffset(LayoutUnit) const;
     MultiColumnFragmentainerGroup& fragmentainerGroupAtFlowThreadOffset(LayoutUnit flowThreadOffset)
     {
         return m_fragmentainerGroups[fragmentainerGroupIndexAtFlowThreadOffset(flowThreadOffset)];
     }
     const MultiColumnFragmentainerGroup& fragmentainerGroupAtFlowThreadOffset(LayoutUnit flowThreadOffset) const
     {
         return m_fragmentainerGroups[fragmentainerGroupIndexAtFlowThreadOffset(flowThreadOffset)];
     }
     const MultiColumnFragmentainerGroup& fragmentainerGroupAtVisualPoint(const LayoutPoint&) const;
     const MultiColumnFragmentainerGroupList& fragmentainerGroups() const { return m_fragmentainerGroups; }
@@ skipping 77 matching lines @@
     void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final;
 
     void attachToFlowThread();
     void detachFromFlowThread();
 
     // The top of the page nearest to the specified block offset. All in flowthread coordinates.
     LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
 
     LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) const;
 
-    void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect);
-
     LayoutUnit columnGap() const;
 
     // The "CSS actual" value of column-count. This includes overflowing columns, if any.
     unsigned actualColumnCount() const;
 
     const char* name() const override { return "LayoutMultiColumnSet"; }
 
     // Sets |columnRuleBounds| to the bounds of each column rule rect's painted extent, adjusted by paint offset,
     // before pixel snapping. Returns true if column rules should be painted at all.
     bool computeColumnRuleBounds(const LayoutPoint& paintOffset, Vector<LayoutRect>& columnRuleBounds) const;
 
     LayoutRect localOverflowRectForPaintInvalidation() const override;
 
 protected:
     LayoutMultiColumnSet(LayoutFlowThread*);
 
 private:
-    unsigned fragmentainerGroupIndexAtFlowThreadOffset(LayoutUnit) const;
-
     void insertedIntoTree() final;
     void willBeRemovedFromTree() final;
 
     bool isSelfCollapsingBlock() const override { return false; }
 
     void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     PositionWithAffinity positionForPoint(const LayoutPoint&) override;
 
     void paintObject(const PaintInfo&, const LayoutPoint& paintOffset) const override;
 
@@ skipping 15 matching lines @@
 
     bool m_initialHeightCalculated;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet());
 
 } // namespace blink
 
 #endif // LayoutMultiColumnSet_h