Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutGeometryMap.h

 /*
  * Copyright (C) 2012 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 19 matching lines @@
 #include "core/layout/LayoutObject.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/geometry/LayoutSize.h"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class Layer;
-class LayoutLayerModelObject;
+class LayoutBoxModelObject;
 class TransformationMatrix;
 class TransformState;
 
 // Can be used while walking the Renderer tree to cache data about offsets and transforms.
 class LayoutGeometryMap {
     WTF_MAKE_NONCOPYABLE(LayoutGeometryMap);
 public:
     LayoutGeometryMap(MapCoordinatesFlags = UseTransforms);
     ~LayoutGeometryMap();
 
     MapCoordinatesFlags mapCoordinatesFlags() const { return m_mapCoordinatesFlags; }
 
     FloatRect absoluteRect(const FloatRect& rect) const
     {
         return mapToContainer(rect, 0).boundingBox();
     }
 
     // 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().
 
     // Push geometry info between this renderer and some ancestor. The ancestor must be its container() or some
     // stacking context between the renderer and its container.
     void push(const LayoutObject*, const LayoutSize&, bool accumulatingTransform = false, bool isNonUniform = false, bool isFixedPosition = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize());
     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&);
 
     bool hasNonUniformStep() const { return m_nonUniformStepsCount; }
     bool hasTransformStep() const { return m_transformedStepsCount; }
     bool hasFixedPositionStep() const { return m_fixedStepsCount; }
 
 #ifndef NDEBUG
     void dumpSteps() const;
@@ skipping 10 matching lines @@
     int m_transformedStepsCount;
     int m_fixedStepsCount;
     LayoutGeometryMapSteps m_mapping;
     LayoutSize m_accumulatedOffset;
     MapCoordinatesFlags m_mapCoordinatesFlags;
 };
 
 } // namespace blink
 
 #endif // LayoutGeometryMap_h