Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutGeometryMap.h

Index: Source/core/layout/LayoutGeometryMap.h
diff --git a/Source/core/layout/LayoutGeometryMap.h b/Source/core/layout/LayoutGeometryMap.h
index 5f693a26d1d77807a30c76097d4fdc487f874df2..e859edb579afea988462035ea2e16b6bc278e23d 100644
--- a/Source/core/layout/LayoutGeometryMap.h
+++ b/Source/core/layout/LayoutGeometryMap.h
@@ -37,7 +37,7 @@
 namespace blink {
 
 class Layer;
-class LayoutLayerModelObject;
+class LayoutBoxModelObject;
 class TransformationMatrix;
 class TransformState;
 
@@ -58,14 +58,14 @@ public:
     // Map to a container. Will assert that the container has been pushed onto this map.
     // A null container maps through the RenderView (including its scale transform, if any).
     // If the container is the RenderView, the scroll offset is applied, but not the scale.
-    FloatPoint mapToContainer(const FloatPoint&, const LayoutLayerModelObject*) const;
-    FloatQuad mapToContainer(const FloatRect&, const LayoutLayerModelObject*) const;
+    FloatPoint mapToContainer(const FloatPoint&, const LayoutBoxModelObject*) const;
+    FloatQuad mapToContainer(const FloatRect&, const LayoutBoxModelObject*) const;
 
     // Called by code walking the renderer or layer trees.
     void pushMappingsToAncestor(const Layer*, const Layer* ancestorLayer);
     void popMappingsToAncestor(const Layer*);
-    void pushMappingsToAncestor(const LayoutObject*, const LayoutLayerModelObject* ancestorRenderer);
-    void popMappingsToAncestor(const LayoutLayerModelObject*);
+    void pushMappingsToAncestor(const LayoutObject*, const LayoutBoxModelObject* ancestorRenderer);
+    void popMappingsToAncestor(const LayoutBoxModelObject*);
 
     // The following methods should only be called by renderers inside a call to pushMappingsToAncestor().
 
@@ -75,7 +75,7 @@ public:
     void push(const LayoutObject*, const TransformationMatrix&, bool accumulatingTransform = false, bool isNonUniform = false, bool isFixedPosition = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
 
 private:
-    void mapToContainer(TransformState&, const LayoutLayerModelObject* container = 0) const;
+    void mapToContainer(TransformState&, const LayoutBoxModelObject* container = 0) const;
 
     void stepInserted(const LayoutGeometryMapStep&);
     void stepRemoved(const LayoutGeometryMapStep&);