Move rendering/RenderLayer* to layout/

Source/web/tests/RenderGeometryMapTest.cpp

Index: Source/web/tests/RenderGeometryMapTest.cpp
diff --git a/Source/web/tests/RenderGeometryMapTest.cpp b/Source/web/tests/RenderGeometryMapTest.cpp
index 822672c0c4781c1cb25c880333790248c123f255..26e10d05cb1e70e83d4e0e9481b9322ea304bbc0 100644
--- a/Source/web/tests/RenderGeometryMapTest.cpp
+++ b/Source/web/tests/RenderGeometryMapTest.cpp
@@ -32,8 +32,8 @@
 #include "core/rendering/RenderGeometryMap.h"
 
 #include "core/dom/Document.h"
+#include "core/layout/Layer.h"
 #include "core/rendering/RenderBox.h"
-#include "core/rendering/RenderLayer.h"
 #include "core/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebUnitTestSupport.h"
@@ -90,23 +90,23 @@ protected:
         return element->renderBox();
     }
 
-    static const RenderLayerModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutLayerModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getRenderBox(webView, elementId);
         if (!rb)
             return nullptr;
-        RenderLayer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
+        Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
     }
 
-    static const RenderLayerModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutLayerModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getFrameElement(frameId, webView, elementId);
         if (!rb)
             return nullptr;
-        RenderLayer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
+        Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
@@ -150,7 +150,7 @@ TEST_F(RenderGeometryMapTest, SimpleGeometryMapTest)
     EXPECT_EQ(FloatPoint(8.0f, 8.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(8.0f, 8.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, nullptr));
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(0.0f, 0.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, nullptr));
 
@@ -193,7 +193,7 @@ TEST_F(RenderGeometryMapTest, TransformedGeometryTest)
     EXPECT_EQ(FloatPoint(8.0f, 8.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(8.0f, 8.0f, 15.0f, 25.0f)), rgm.mapToContainer(rect, nullptr));
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(0.0f, 0.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, nullptr).boundingBox());
 
@@ -238,7 +238,7 @@ TEST_F(RenderGeometryMapTest, FixedGeometryTest)
     EXPECT_EQ(FloatPoint(8.0f, 8.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(8.0f, 8.0f, 15.0f, 25.0f)), rgm.mapToContainer(rect, nullptr));
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(0.0f, 0.0f, 15.0f, 25.0f)), rgm.mapToContainer(rect, nullptr));
 
@@ -308,8 +308,8 @@ TEST_F(RenderGeometryMapTest, IframeTest)
     EXPECT_NEAR(1.866, rectFromQuad(rgm.mapToContainer(rect, nullptr)).width(), 0.0001f);
     EXPECT_NEAR(2.232, rectFromQuad(rgm.mapToContainer(rect, nullptr)).height(), 0.0001f);
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
-    rgmNoFrame.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
+    rgmNoFrame.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgmNoFrame.mapToContainer(point, nullptr));
 
@@ -367,7 +367,7 @@ TEST_F(RenderGeometryMapTest, ColumnTest)
     EXPECT_EQ(FloatPoint(8.0f, 8.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(8.0f, 8.0f, 5.0f, 3.0f)), rgm.mapToContainer(rect, nullptr));
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     EXPECT_EQ(FloatPoint(0.0f, 0.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(0.0f, 0.0f, 5.0f, 3.0f)), rgm.mapToContainer(rect, nullptr));
 
@@ -375,7 +375,7 @@ TEST_F(RenderGeometryMapTest, ColumnTest)
     EXPECT_EQ(FloatPoint(8.0f, 8.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(8.0f, 8.0f, 5.0f, 3.0f)), rgm.mapToContainer(rect, nullptr));
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     rgm.pushMappingsToAncestor(getRenderBox(webView, "Col2"), nullptr);
     EXPECT_NEAR(8.0f + offset, rgm.mapToContainer(point, nullptr).x(), 0.1f);
     EXPECT_NEAR(8.0f, rgm.mapToContainer(point, nullptr).y(), 0.1f);
@@ -384,7 +384,7 @@ TEST_F(RenderGeometryMapTest, ColumnTest)
     EXPECT_EQ(5.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).width());
     EXPECT_EQ(3.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).height());
 
-    rgm.popMappingsToAncestor(static_cast<RenderLayer*>(nullptr));
+    rgm.popMappingsToAncestor(static_cast<Layer*>(nullptr));
     rgm.pushMappingsToAncestor(getRenderBox(webView, "Col3"), nullptr);
     EXPECT_NEAR(8.0f + offset * 2.0f, rgm.mapToContainer(point, nullptr).x(), 0.1f);
     EXPECT_NEAR(8.0f, rgm.mapToContainer(point, nullptr).y(), 0.1f);