Move rendering/RenderLayer* to layout/

Source/web/tests/RenderGeometryMapTest.cpp

 /*
  * Copyright (C) 2014 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR 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.
  */
 
 #include "config.h"
 #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"
 #include "public/web/WebFrameClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FloatPointTestHelpers.h"
 #include "web/tests/FloatQuadTestHelpers.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <gtest/gtest.h>
 
@@ skipping 36 matching lines @@
         if (!webViewImpl)
             return nullptr;
         LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
         Document* doc = frame->document();
         Element* element = doc->getElementById(elementId);
         if (!element)
             return nullptr;
         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();
     }
 
     static const FloatRect rectFromQuad(const FloatQuad& quad)
     {
         FloatRect rect;
         rect.setX(std::min(quad.p1().x(), std::min(quad.p2().x(), std::min(quad.p3().x(), quad.p4().x()))));
         rect.setY(std::min(quad.p1().y(), std::min(quad.p2().y(), std::min(quad.p3().y(), quad.p4().y()))));
@@ skipping 23 matching lines @@
     // We are going test everything twice. Once with FloatPoints and once with
     // FloatRects. This is because RenderGeometryMap treats both slightly
     // differently
     RenderGeometryMap rgm;
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
     FloatPoint point;
     FloatRect rect(0.0f, 0.0f, 1.0f, 2.0f);
     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));
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InnerDiv"), 0);
     EXPECT_EQ(FloatPoint(21.0f, 6.0f), rgm.mapToContainer(point, getRenderBox(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(21.0f, 6.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getRenderBox(webView, "CenterDiv")));
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "OtherDiv"), getRenderBox(webView, "InnerDiv"));
     EXPECT_EQ(FloatPoint(22.0f, 12.0f), rgm.mapToContainer(point, getRenderBox(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(22.0f, 12.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getRenderBox(webView, "CenterDiv")));
@@ skipping 22 matching lines @@
     RenderGeometryMap rgm;
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
     FloatPoint point;
     const float rectWidth = 15.0f;
     const float scaleWidth = 2.0f;
     const float scaleHeight = 3.0f;
     FloatRect rect(0.0f, 0.0f, 15.0f, 25.0f);
     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());
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InnerDiv"), 0);
     EXPECT_EQ(FloatPoint(523.0f, 6.0f), rgm.mapToContainer(point, getRenderBox(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(523.0f - rectWidth, 6.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getRenderBox(webView, "CenterDiv")).boundingBox());
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "OtherDiv"), getRenderBox(webView, "InnerDiv"));
     EXPECT_EQ(FloatPoint(522.0f, 12.0f), rgm.mapToContainer(point, getRenderBox(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(522.0f - rectWidth, 12.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getRenderBox(webView, "CenterDiv")).boundingBox());
@@ skipping 24 matching lines @@
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     RenderGeometryMap rgm;
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
     FloatPoint point;
     FloatRect rect(0.0f, 0.0f, 15.0f, 25.0f);
     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));
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "InnerDiv"), 0);
     EXPECT_EQ(FloatPoint(20.0f, 14.0f), rgm.mapToContainer(point, getRenderContainer(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(20.0f, 14.0f, 15.0f, 25.0f)), rgm.mapToContainer(rect, nullptr));
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "OtherDiv"), getRenderBox(webView, "InnerDiv"));
     EXPECT_EQ(FloatPoint(21.0f, 20.0f), rgm.mapToContainer(point, getRenderContainer(webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(21.0f, 20.0f, 15.0f, 25.0f)), rgm.mapToContainer(rect, getRenderContainer(webView, "CenterDiv")));
@@ skipping 49 matching lines @@
     // That maximum x should likewise be p0.x + cos(30deg) = p0.x + 0.866.
     // And the maximum y should be p0.x + sin(30deg) + 2*cos(30deg)
     //      = p0.y + 2.232.
     EXPECT_NEAR(70.5244f, rgm.mapToContainer(point, nullptr).x(), 0.0001f);
     EXPECT_NEAR(-44.0237f, rgm.mapToContainer(point, nullptr).y(), 0.0001f);
     EXPECT_NEAR(69.5244f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).x(), 0.0001f);
     EXPECT_NEAR(-44.0237, rectFromQuad(rgm.mapToContainer(rect, nullptr)).y(), 0.0001f);
     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));
 
     rgm.pushMappingsToAncestor(getFrameElement("test_frame", webView, "InnerDiv"), 0);
     rgmNoFrame.pushMappingsToAncestor(getFrameElement("test_frame", webView, "InnerDiv"), 0);
     EXPECT_EQ(FloatPoint(21.0f, 6.0f), rgm.mapToContainer(point, getFrameRenderContainer("test_frame", webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(21.0f, 6.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getFrameRenderContainer("test_frame", webView, "CenterDiv")));
     EXPECT_EQ(FloatPoint(21.0f, 6.0f), rgmNoFrame.mapToContainer(point, getFrameRenderContainer("test_frame", webView, "CenterDiv")));
     EXPECT_EQ(FloatQuad(FloatRect(21.0f, 6.0f, 1.0f, 2.0f)), rgmNoFrame.mapToContainer(rect, getFrameRenderContainer("test_frame", webView, "CenterDiv")));
 
@@ skipping 37 matching lines @@
     float offset = (1000.0f - 16.0f - 20.0f) / 3.0f + 10.0f;
 
     RenderGeometryMap rgm;
     rgm.pushMappingsToAncestor(getRenderBox(webView, "A"), 0);
     FloatPoint point;
     FloatRect rect(0.0f, 0.0f, 5.0f, 3.0f);
 
     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));
 
     rgm.pushMappingsToAncestor(getRenderBox(webView, "Col1"), 0);
     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);
     EXPECT_NEAR(8.0f + offset, rectFromQuad(rgm.mapToContainer(rect, nullptr)).x(), 0.1f);
     EXPECT_NEAR(8.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).y(), 0.1f);
     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);
     EXPECT_NEAR(8.0f + offset * 2.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).x(), 0.1f);
     EXPECT_NEAR(8.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).y(), 0.1f);
     EXPECT_EQ(5.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).width());
     EXPECT_EQ(3.0f, rectFromQuad(rgm.mapToContainer(rect, nullptr)).height());
 
 }
 } // namespace ::