Move rendering/RenderBox to layout/LayoutBox.

Source/core/layout/LayoutMultiColumnFlowThread.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 110 matching lines @@
     static LayoutMultiColumnFlowThread* createAnonymous(Document&, const LayoutStyle& parentStyle);
 
     virtual bool isLayoutMultiColumnFlowThread() const override final { return true; }
 
     RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(parent()); }
 
     LayoutMultiColumnSet* firstMultiColumnSet() const;
     LayoutMultiColumnSet* lastMultiColumnSet() const;
 
     // Return the first column set or spanner placeholder.
-    RenderBox* firstMultiColumnBox() const
+    LayoutBox* firstMultiColumnBox() const
     {
         return nextSiblingBox();
     }
     // Return the last column set or spanner placeholder.
-    RenderBox* lastMultiColumnBox() const
+    LayoutBox* lastMultiColumnBox() const
     {
-        RenderBox* lastSiblingBox = multiColumnBlockFlow()->lastChildBox();
+        LayoutBox* lastSiblingBox = multiColumnBlockFlow()->lastChildBox();
         // The flow thread is the first child of the multicol container. If the flow thread is also
         // the last child, it means that there are no siblings; i.e. we have no column boxes.
         return lastSiblingBox != this ? lastSiblingBox : 0;
     }
 
     // Find the first set inside which the specified renderer would be rendered.
     LayoutMultiColumnSet* findSetRendering(LayoutObject*) const;
 
     // Return the spanner placeholder that belongs to the spanner in the containing block chain, if
     // any. This includes the renderer for the element that actually establishes the spanner too.
@@ skipping 27 matching lines @@
     void columnRuleStyleDidChange();
 
 protected:
     LayoutMultiColumnFlowThread();
     void setProgressionIsInline(bool isInline) { m_progressionIsInline = isInline; }
 
     virtual void layout() override;
 
 private:
     void calculateColumnCountAndWidth(LayoutUnit& width, unsigned& count) const;
-    void createAndInsertMultiColumnSet(RenderBox* insertBefore = 0);
-    void createAndInsertSpannerPlaceholder(RenderBox* spanner, RenderBox* insertBefore = 0);
+    void createAndInsertMultiColumnSet(LayoutBox* insertBefore = 0);
+    void createAndInsertSpannerPlaceholder(LayoutBox* spanner, LayoutBox* insertBefore = 0);
     virtual bool descendantIsValidColumnSpanner(LayoutObject* descendant) const;
 
     virtual const char* renderName() const override;
     virtual void addRegionToThread(LayoutMultiColumnSet*) override;
     virtual void willBeRemovedFromTree() override;
-    virtual LayoutUnit skipColumnSpanner(RenderBox*, LayoutUnit logicalTopInFlowThread) override;
+    virtual LayoutUnit skipColumnSpanner(LayoutBox*, LayoutUnit logicalTopInFlowThread) override;
     virtual void flowThreadDescendantWasInserted(LayoutObject*) override;
     virtual void flowThreadDescendantWillBeRemoved(LayoutObject*) override;
     virtual void computePreferredLogicalWidths() override;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
     virtual void updateLogicalWidth() override;
     virtual void setPageBreak(LayoutUnit offset, LayoutUnit spaceShortage) override;
     virtual void updateMinimumPageHeight(LayoutUnit offset, LayoutUnit minHeight) override;
     virtual bool addForcedRegionBreak(LayoutUnit, LayoutObject* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0) override;
     virtual bool isPageLogicalHeightKnown() const override;
 
     // The last set we worked on. It's not to be used as the "current set". The concept of a
     // "current set" is difficult, since layout may jump back and forth in the tree, due to wrong
     // top location estimates (due to e.g. margin collapsing), and possibly for other reasons.
     LayoutMultiColumnSet* m_lastSetWorkedOn;
 
     unsigned m_columnCount; // The used value of column-count
     LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.
     bool m_inBalancingPass; // Set when relayouting for column balancing.
     bool m_needsColumnHeightsRecalculation; // Set when we need to recalculate the column set heights after layout.
     bool m_progressionIsInline; // Always true for regular multicol. False for paged-y overflow.
     bool m_isBeingEvacuated;
 };
 
 } // namespace blink
 
 #endif // LayoutMultiColumnFlowThread_h