Move rendering/RenderObject to layout/LayoutObject.

Source/core/rendering/RenderMultiColumnSet.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 17 matching lines @@
 #define RenderMultiColumnSet_h
 
 #include "core/rendering/RenderMultiColumnFlowThread.h"
 #include "core/rendering/RenderRegion.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 // RenderMultiColumnSet represents a set of columns that all have the same width and height. By
 // combining runs of same-size columns into a single object, we significantly reduce the number of
-// unique RenderObjects required to represent columns.
+// unique LayoutObjects required to represent columns.
 //
 // Column sets are inserted as anonymous children of the actual multicol container (i.e. the
 // renderer whose style computes to non-auto column-count and/or column-width).
 //
 // Being a "region", a column set has no children on its own, but is merely used to slice a portion
 // of the tall "single-column" flow thread into actual columns visually, to convert from flow thread
 // coordinates to visual ones. It is in charge of both positioning columns correctly relatively to
 // the parent multicol container, and to calculate the correct translation for each column's
 // contents, and to paint any rules between them. RenderMultiColumnSet objects are used for
 // painting, hit testing, and any other type of operation that requires mapping from flow thread
 // coordinates to visual coordinates.
 //
 // Column spans result in the creation of new column sets, since a spanning renderer has to be
 // placed in between the column sets that come before and after the span.
 class RenderMultiColumnSet : public RenderRegion {
 public:
     enum BalancedHeightCalculation { GuessFromFlowThreadPortion, StretchBySpaceShortage };
 
     static RenderMultiColumnSet* createAnonymous(RenderFlowThread*, RenderStyle* parentStyle);
 
-    virtual bool isOfType(RenderObjectType type) const override { return type == RenderObjectRenderMultiColumnSet || RenderRegion::isOfType(type); }
+    virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRenderMultiColumnSet || RenderRegion::isOfType(type); }
 
     virtual LayoutUnit pageLogicalWidth() const override final { return flowThread()->logicalWidth(); }
     virtual LayoutUnit pageLogicalHeight() const override final { return m_columnHeight; }
 
     RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(parent()); }
     RenderMultiColumnFlowThread* multiColumnFlowThread() const
     {
         ASSERT_WITH_SECURITY_IMPLICATION(!flowThread() || flowThread()->isRenderMultiColumnFlowThread());
         return static_cast<RenderMultiColumnFlowThread*>(flowThread());
     }
@@ skipping 156 matching lines @@
 
 inline void RenderMultiColumnSet::endFlow(LayoutUnit offsetInFlowThread)
 {
     // At this point layout is exactly at the end of this set. Store block offset from flow thread
     // start. This set is now considered "flowed", although we may have to revisit it later (with
     // beginFlow()), e.g. if a subtree in the flow thread has to be laid out over again because the
     // initial margin collapsing estimates were wrong.
     setLogicalBottomInFlowThread(offsetInFlowThread);
 }
 
-DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
+DEFINE_LAYOUT_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
 
 } // namespace blink
 
 #endif // RenderMultiColumnSet_h