Move rendering/RenderLayer* to layout/

Source/core/rendering/RenderGeometryMap.cpp

Index: Source/core/rendering/RenderGeometryMap.cpp
diff --git a/Source/core/rendering/RenderGeometryMap.cpp b/Source/core/rendering/RenderGeometryMap.cpp
index ddb29e85388d41e1b9e251858db6c7f28e7872d9..9650c1780d8a823ea2acf37600fce9b03935369c 100644
--- a/Source/core/rendering/RenderGeometryMap.cpp
+++ b/Source/core/rendering/RenderGeometryMap.cpp
@@ -27,7 +27,7 @@
 #include "core/rendering/RenderGeometryMap.h"
 
 #include "core/frame/LocalFrame.h"
-#include "core/rendering/RenderLayer.h"
+#include "core/layout/Layer.h"
 #include "core/rendering/RenderView.h"
 #include "platform/geometry/TransformState.h"
 #include "wtf/TemporaryChange.h"
@@ -47,7 +47,7 @@ RenderGeometryMap::~RenderGeometryMap()
 {
 }
 
-void RenderGeometryMap::mapToContainer(TransformState& transformState, const RenderLayerModelObject* container) const
+void RenderGeometryMap::mapToContainer(TransformState& transformState, const LayoutLayerModelObject* container) const
 {
     // If the mapping includes something like columns, we have to go via renderers.
     if (hasNonUniformStep()) {
@@ -104,7 +104,7 @@ void RenderGeometryMap::mapToContainer(TransformState& transformState, const Ren
     transformState.flatten();
 }
 
-FloatPoint RenderGeometryMap::mapToContainer(const FloatPoint& p, const RenderLayerModelObject* container) const
+FloatPoint RenderGeometryMap::mapToContainer(const FloatPoint& p, const LayoutLayerModelObject* container) const
 {
     FloatPoint result;
 
@@ -119,7 +119,7 @@ FloatPoint RenderGeometryMap::mapToContainer(const FloatPoint& p, const RenderLa
 #if ENABLE(ASSERT)
     if (m_mapping.size() > 0) {
         const RenderObject* lastRenderer = m_mapping.last().m_renderer;
-        const RenderLayer* layer = lastRenderer->enclosingLayer();
+        const Layer* layer = lastRenderer->enclosingLayer();
 
         // Bounds for invisible layers are intentionally not calculated, and are
         // therefore not necessarily expected to be correct here. This is ok,
@@ -149,7 +149,7 @@ void RenderGeometryMap::dumpSteps() const
 }
 #endif
 
-FloatQuad RenderGeometryMap::mapToContainer(const FloatRect& rect, const RenderLayerModelObject* container) const
+FloatQuad RenderGeometryMap::mapToContainer(const FloatRect& rect, const LayoutLayerModelObject* container) const
 {
     FloatQuad result;
 
@@ -165,7 +165,7 @@ FloatQuad RenderGeometryMap::mapToContainer(const FloatRect& rect, const RenderL
 #if ENABLE(ASSERT)
     if (m_mapping.size() > 0) {
         const RenderObject* lastRenderer = m_mapping.last().m_renderer;
-        const RenderLayer* layer = lastRenderer->enclosingLayer();
+        const Layer* layer = lastRenderer->enclosingLayer();
 
         // Bounds for invisible layers are intentionally not calculated, and are
         // therefore not necessarily expected to be correct here. This is ok,
@@ -183,7 +183,7 @@ FloatQuad RenderGeometryMap::mapToContainer(const FloatRect& rect, const RenderL
     return result;
 }
 
-void RenderGeometryMap::pushMappingsToAncestor(const RenderObject* renderer, const RenderLayerModelObject* ancestorRenderer)
+void RenderGeometryMap::pushMappingsToAncestor(const RenderObject* renderer, const LayoutLayerModelObject* ancestorRenderer)
 {
     // We need to push mappings in reverse order here, so do insertions rather than appends.
     TemporaryChange<size_t> positionChange(m_insertionPosition, m_mapping.size());
@@ -211,7 +211,7 @@ static bool canMapBetweenRenderers(const RenderObject* renderer, const RenderObj
     return true;
 }
 
-void RenderGeometryMap::pushMappingsToAncestor(const RenderLayer* layer, const RenderLayer* ancestorLayer)
+void RenderGeometryMap::pushMappingsToAncestor(const Layer* layer, const Layer* ancestorLayer)
 {
     const RenderObject* renderer = layer->renderer();
 
@@ -239,7 +239,7 @@ void RenderGeometryMap::pushMappingsToAncestor(const RenderLayer* layer, const R
         push(renderer, toLayoutSize(layerOffset), accumulatingTransform, /*isNonUniform*/ false, /*isFixedPosition*/ false, /*hasTransform*/ false);
         return;
     }
-    const RenderLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
+    const LayoutLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
     pushMappingsToAncestor(renderer, ancestorRenderer);
 }
 
@@ -279,7 +279,7 @@ void RenderGeometryMap::push(const RenderObject* renderer, const TransformationM
     stepInserted(step);
 }
 
-void RenderGeometryMap::popMappingsToAncestor(const RenderLayerModelObject* ancestorRenderer)
+void RenderGeometryMap::popMappingsToAncestor(const LayoutLayerModelObject* ancestorRenderer)
 {
     ASSERT(m_mapping.size());
 
@@ -289,9 +289,9 @@ void RenderGeometryMap::popMappingsToAncestor(const RenderLayerModelObject* ance
     }
 }
 
-void RenderGeometryMap::popMappingsToAncestor(const RenderLayer* ancestorLayer)
+void RenderGeometryMap::popMappingsToAncestor(const Layer* ancestorLayer)
 {
-    const RenderLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
+    const LayoutLayerModelObject* ancestorRenderer = ancestorLayer ? ancestorLayer->renderer() : 0;
     popMappingsToAncestor(ancestorRenderer);
 }