Move rendering/RenderLayer* to layout/

Source/core/rendering/RenderFlowThread.h

 /*
  * 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 12 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #ifndef RenderFlowThread_h
 #define RenderFlowThread_h
 
-#include "core/rendering/LayerFragment.h"
+#include "core/layout/LayerFragment.h"
 #include "core/rendering/RenderBlockFlow.h"
 #include "wtf/ListHashSet.h"
 
 namespace blink {
 
 class RenderMultiColumnSet;
 class RenderRegion;
 
 typedef ListHashSet<RenderMultiColumnSet*> RenderMultiColumnSetList;
 
 // RenderFlowThread is used to collect all the render objects that participate in a
 // flow thread. It will also help in doing the layout. However, it will not render
 // directly to screen. Instead, RenderRegion objects will redirect their paint
 // and nodeAtPoint methods to this object. Each RenderRegion will actually be a viewPort
 // of the RenderFlowThread.
 
 class RenderFlowThread: public RenderBlockFlow {
 public:
     RenderFlowThread();
     virtual ~RenderFlowThread() { };
 
     virtual bool isRenderFlowThread() const override final { return true; }
     virtual bool isRenderMultiColumnFlowThread() const { return false; }
     virtual bool isRenderPagedFlowThread() const { return false; }
 
     virtual bool supportsPaintInvalidationStateCachedOffsets() const override { return false; }
 
     virtual void layout() override;
 
-    // Always create a RenderLayer for the RenderFlowThread so that we
+    // Always create a Layer for the RenderFlowThread so that we
     // can easily avoid drawing the children directly.
     virtual LayerType layerTypeRequired() const override final { return NormalLayer; }
 
     // Skip past a column spanner during flow thread layout. Spanners are not laid out inside the
     // flow thread, since the flow thread is not in a spanner's containing block chain (since the
     // containing block is the multicol container). If the spanner follows right after a column set
     // (as opposed to following another spanner), we may have to stretch the flow thread to ensure
     // completely filled columns in the preceding column set. Return this adjustment, if any.
     virtual LayoutUnit skipColumnSpanner(RenderBox*, LayoutUnit logicalTopInFlowThread) { return LayoutUnit(); }
 
     virtual void flowThreadDescendantWasInserted(RenderObject*) { }
     virtual void flowThreadDescendantWillBeRemoved(RenderObject*) { }
 
     virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
 
     virtual void addRegionToThread(RenderMultiColumnSet*) = 0;
     virtual void removeRegionFromThread(RenderMultiColumnSet*);
 
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
 
     bool hasRegions() const { return m_multiColumnSetList.size(); }
 
     void validateRegions();
     void invalidateRegions();
     bool hasValidRegionInfo() const { return !m_regionsInvalidated && !m_multiColumnSetList.isEmpty(); }
 
-    virtual void mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
+    virtual void mapRectToPaintInvalidationBacking(const LayoutLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override;
 
     LayoutUnit pageLogicalHeightForOffset(LayoutUnit);
     LayoutUnit pageRemainingLogicalHeightForOffset(LayoutUnit, PageBoundaryRule = IncludePageBoundary);
 
     virtual void setPageBreak(LayoutUnit /*offset*/, LayoutUnit /*spaceShortage*/) { }
     virtual void updateMinimumPageHeight(LayoutUnit /*offset*/, LayoutUnit /*minHeight*/) { }
 
     bool regionsHaveUniformLogicalHeight() const { return m_regionsHaveUniformLogicalHeight; }
 
     // FIXME: These 2 functions should return a RenderMultiColumnSet.
@@ skipping 63 matching lines @@
 };
 
 template <> struct ValueToString<RenderMultiColumnSet*> {
     static String string(const RenderMultiColumnSet* value) { return String::format("%p", value); }
 };
 #endif
 
 } // namespace blink
 
 #endif // RenderFlowThread_h