Index: Source/core/rendering/RenderGeometryMap.h |
diff --git a/Source/core/rendering/RenderGeometryMap.h b/Source/core/rendering/RenderGeometryMap.h |
index 6e3896c29314a531f2bd62d705480449f613d853..2c3b96ccf06d5cb69f28e71f1f9fbcfb61353da2 100644 |
--- a/Source/core/rendering/RenderGeometryMap.h |
+++ b/Source/core/rendering/RenderGeometryMap.h |
@@ -36,8 +36,8 @@ |
namespace blink { |
-class RenderLayer; |
-class RenderLayerModelObject; |
+class Layer; |
+class LayoutLayerModelObject; |
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 RenderLayerModelObject*) const; |
- FloatQuad mapToContainer(const FloatRect&, const RenderLayerModelObject*) const; |
+ FloatPoint mapToContainer(const FloatPoint&, const LayoutLayerModelObject*) const; |
+ FloatQuad mapToContainer(const FloatRect&, const LayoutLayerModelObject*) const; |
// Called by code walking the renderer or layer trees. |
- void pushMappingsToAncestor(const RenderLayer*, const RenderLayer* ancestorLayer); |
- void popMappingsToAncestor(const RenderLayer*); |
- void pushMappingsToAncestor(const RenderObject*, const RenderLayerModelObject* ancestorRenderer); |
- void popMappingsToAncestor(const RenderLayerModelObject*); |
+ void pushMappingsToAncestor(const Layer*, const Layer* ancestorLayer); |
+ void popMappingsToAncestor(const Layer*); |
+ void pushMappingsToAncestor(const RenderObject*, const LayoutLayerModelObject* ancestorRenderer); |
+ void popMappingsToAncestor(const LayoutLayerModelObject*); |
// The following methods should only be called by renderers inside a call to pushMappingsToAncestor(). |
@@ -75,7 +75,7 @@ public: |
void push(const RenderObject*, const TransformationMatrix&, bool accumulatingTransform = false, bool isNonUniform = false, bool isFixedPosition = false, bool hasTransform = false, LayoutSize offsetForFixedPosition = LayoutSize()); |
private: |
- void mapToContainer(TransformState&, const RenderLayerModelObject* container = 0) const; |
+ void mapToContainer(TransformState&, const LayoutLayerModelObject* container = 0) const; |
void stepInserted(const RenderGeometryMapStep&); |
void stepRemoved(const RenderGeometryMapStep&); |