Move rendering/RenderBox to layout/LayoutBox.

Source/web/tests/LayoutGeometryMapTest.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 15 matching lines @@
  * 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/layout/LayoutGeometryMap.h"
 
 #include "core/dom/Document.h"
 #include "core/layout/Layer.h"
-#include "core/rendering/RenderBox.h"
+#include "core/layout/LayoutBox.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 10 matching lines @@
         : m_baseURL("http://www.test.com/")
     {
     }
 
     virtual void TearDown()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
     }
 
 protected:
-    static RenderBox* getFrameElement(const char* iframeName, WebView* webView, const WTF::AtomicString& elementId)
+    static LayoutBox* getFrameElement(const char* iframeName, WebView* webView, const WTF::AtomicString& elementId)
     {
         WebLocalFrameImpl* iframe = toWebLocalFrameImpl(webView->findFrameByName(WebString::fromUTF8(iframeName)));
         if (!iframe)
             return nullptr;
         LocalFrame* frame = iframe->frame();
         Document* doc = frame->document();
         Element* element = doc->getElementById(elementId);
         if (!element)
             return nullptr;
-        return element->renderBox();
+        return element->layoutBox();
     }
 
-    static RenderBox* getRenderBox(WebView* webView, const WTF::AtomicString& elementId)
+    static LayoutBox* getLayoutBox(WebView* webView, const WTF::AtomicString& elementId)
     {
         WebViewImpl* webViewImpl = toWebViewImpl(webView);
         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();
+        return element->layoutBox();
     }
 
     static const LayoutBoxModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
     {
-        RenderBox* rb = getRenderBox(webView, elementId);
+        LayoutBox* rb = getLayoutBox(webView, elementId);
         if (!rb)
             return nullptr;
         Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
     }
 
     static const LayoutBoxModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
     {
-        RenderBox* rb = getFrameElement(frameId, webView, elementId);
+        LayoutBox* rb = getFrameElement(frameId, webView, elementId);
         if (!rb)
             return nullptr;
         Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
     }
 
     static const FloatRect rectFromQuad(const FloatQuad& quad)
     {
@@ skipping 20 matching lines @@
     registerMockedHttpURLLoad("rgm_test.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "rgm_test.html", true, 0, 0);
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     // We are going test everything twice. Once with FloatPoints and once with
     // FloatRects. This is because LayoutGeometryMap treats both slightly
     // differently
     LayoutGeometryMap rgm;
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<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(getLayoutBox(webView, "InnerDiv"), 0);
+    EXPECT_EQ(FloatPoint(21.0f, 6.0f), rgm.mapToContainer(point, getLayoutBox(webView, "CenterDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(21.0f, 6.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getLayoutBox(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")));
+    rgm.pushMappingsToAncestor(getLayoutBox(webView, "OtherDiv"), getLayoutBox(webView, "InnerDiv"));
+    EXPECT_EQ(FloatPoint(22.0f, 12.0f), rgm.mapToContainer(point, getLayoutBox(webView, "CenterDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(22.0f, 12.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getLayoutBox(webView, "CenterDiv")));
 
-    EXPECT_EQ(FloatPoint(1.0f, 6.0f), rgm.mapToContainer(point, getRenderBox(webView, "InnerDiv")));
-    EXPECT_EQ(FloatQuad(FloatRect(1.0f, 6.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getRenderBox(webView, "InnerDiv")));
+    EXPECT_EQ(FloatPoint(1.0f, 6.0f), rgm.mapToContainer(point, getLayoutBox(webView, "InnerDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(1.0f, 6.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, getLayoutBox(webView, "InnerDiv")));
 
     EXPECT_EQ(FloatPoint(50.0f, 44.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(50.0f, 44.0f, 1.0f, 2.0f)), rgm.mapToContainer(rect, nullptr));
 }
 
 // Fails on Windows due to crbug.com/391457. When run through the transform the
 // position on windows differs by a pixel
 #if OS(WIN)
 TEST_F(LayoutGeometryMapTest, DISABLED_TransformedGeometryTest)
 #else
 TEST_F(LayoutGeometryMapTest, TransformedGeometryTest)
 #endif
 {
     registerMockedHttpURLLoad("rgm_transformed_test.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "rgm_transformed_test.html", true, 0, 0);
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     LayoutGeometryMap rgm;
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<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(getLayoutBox(webView, "InnerDiv"), 0);
+    EXPECT_EQ(FloatPoint(523.0f, 6.0f), rgm.mapToContainer(point, getLayoutBox(webView, "CenterDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(523.0f - rectWidth, 6.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getLayoutBox(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());
+    rgm.pushMappingsToAncestor(getLayoutBox(webView, "OtherDiv"), getLayoutBox(webView, "InnerDiv"));
+    EXPECT_EQ(FloatPoint(522.0f, 12.0f), rgm.mapToContainer(point, getLayoutBox(webView, "CenterDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(522.0f - rectWidth, 12.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getLayoutBox(webView, "CenterDiv")).boundingBox());
 
-    EXPECT_EQ(FloatPoint(1.0f, 6.0f), rgm.mapToContainer(point, getRenderBox(webView, "InnerDiv")));
-    EXPECT_EQ(FloatQuad(FloatRect(1.0f, 6.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getRenderBox(webView, "InnerDiv")).boundingBox());
+    EXPECT_EQ(FloatPoint(1.0f, 6.0f), rgm.mapToContainer(point, getLayoutBox(webView, "InnerDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(1.0f, 6.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getLayoutBox(webView, "InnerDiv")).boundingBox());
 
     EXPECT_EQ(FloatPoint(821.0f, 31.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(821.0f - rectWidth * scaleWidth, 31.0f, 15.0f * scaleWidth, 25.0f * scaleHeight)).boundingBox(), rgm.mapToContainer(rect, nullptr).boundingBox());
 
     point = FloatPoint(10.0f, 25.0f);
     rect = FloatRect(10.0f, 25.0f, 15.0f, 25.0f);
-    EXPECT_EQ(FloatPoint(512.0f, 37.0f), rgm.mapToContainer(point, getRenderBox(webView, "CenterDiv")));
-    EXPECT_EQ(FloatQuad(FloatRect(512.0f - rectWidth, 37.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getRenderBox(webView, "CenterDiv")).boundingBox());
+    EXPECT_EQ(FloatPoint(512.0f, 37.0f), rgm.mapToContainer(point, getLayoutBox(webView, "CenterDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(512.0f - rectWidth, 37.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getLayoutBox(webView, "CenterDiv")).boundingBox());
 
-    EXPECT_EQ(FloatPoint(11.0f, 31.0f), rgm.mapToContainer(point, getRenderBox(webView, "InnerDiv")));
-    EXPECT_EQ(FloatQuad(FloatRect(11.0f, 31.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getRenderBox(webView, "InnerDiv")).boundingBox());
+    EXPECT_EQ(FloatPoint(11.0f, 31.0f), rgm.mapToContainer(point, getLayoutBox(webView, "InnerDiv")));
+    EXPECT_EQ(FloatQuad(FloatRect(11.0f, 31.0f, 15.0f, 25.0f)).boundingBox(), rgm.mapToContainer(rect, getLayoutBox(webView, "InnerDiv")).boundingBox());
 
     EXPECT_EQ(FloatPoint(801.0f, 106.0f), rgm.mapToContainer(point, nullptr));
     EXPECT_EQ(FloatQuad(FloatRect(801.0f - rectWidth * scaleWidth, 106.0f, 15.0f * scaleWidth, 25.0f * scaleHeight)).boundingBox(), rgm.mapToContainer(rect, nullptr).boundingBox());
 }
 
 TEST_F(LayoutGeometryMapTest, FixedGeometryTest)
 {
     registerMockedHttpURLLoad("rgm_fixed_position_test.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "rgm_fixed_position_test.html", true, 0, 0);
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     LayoutGeometryMap rgm;
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "InitialDiv"), 0);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<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);
+    rgm.pushMappingsToAncestor(getLayoutBox(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"));
+    rgm.pushMappingsToAncestor(getLayoutBox(webView, "OtherDiv"), getLayoutBox(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")));
 
     EXPECT_EQ(FloatPoint(21.0f, 20.0f), rgm.mapToContainer(point, getRenderContainer(webView, "InnerDiv")));
     EXPECT_EQ(FloatPoint(21.0f, 20.0f), rgm.mapToContainer(point, nullptr));
 
     point = FloatPoint(10.0f, 25.0f);
     rect = FloatRect(22.0f, 15.2f, 15.3f, 0.0f);
     EXPECT_EQ(FloatQuad(FloatRect(43.0f, 35.2f, 15.3f, 0.0f)), rgm.mapToContainer(rect, getRenderContainer(webView, "CenterDiv")));
 
@@ skipping 93 matching lines @@
 
     // The document is 1000f wide (we resized to that size).
     // We have a 8px margin on either side of the document.
     // Between each column we have a 10px gap, and we have 3 columns.
     // The width of a given column is (1000 - 16 - 20)/3.
     // The total offset between any column and it's neighbour is width + 10px
     // (for the gap).
     float offset = (1000.0f - 16.0f - 20.0f) / 3.0f + 10.0f;
 
     LayoutGeometryMap rgm;
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "A"), 0);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<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);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<Layer*>(nullptr));
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "Col2"), nullptr);
+    rgm.pushMappingsToAncestor(getLayoutBox(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<Layer*>(nullptr));
-    rgm.pushMappingsToAncestor(getRenderBox(webView, "Col3"), nullptr);
+    rgm.pushMappingsToAncestor(getLayoutBox(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 ::