Merge back LayoutLayerModelObject into RenderBoxModelObject

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 72 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 LayoutLayerModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutBoxModelObject* getRenderContainer(WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getRenderBox(webView, elementId);
         if (!rb)
             return nullptr;
         Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
     }
 
-    static const LayoutLayerModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
+    static const LayoutBoxModelObject* getFrameRenderContainer(const char* frameId, WebView* webView, const WTF::AtomicString &elementId)
     {
         RenderBox* rb = getFrameElement(frameId, webView, elementId);
         if (!rb)
             return nullptr;
         Layer* compositingLayer = rb->enclosingLayer()->enclosingLayerForPaintInvalidation();
         if (!compositingLayer)
             return nullptr;
         return compositingLayer->renderer();
     }
 
@@ skipping 273 matching lines @@
     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 ::