Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/svg/LayoutSVGModelObject.cpp

Index: Source/core/layout/svg/LayoutSVGModelObject.cpp
diff --git a/Source/core/layout/svg/LayoutSVGModelObject.cpp b/Source/core/layout/svg/LayoutSVGModelObject.cpp
index 8b3707945ae02dd8f3fc9470397924e08d5ec50f..1aa16211f261ed9080b2d9449b46b272e39ab994 100644
--- a/Source/core/layout/svg/LayoutSVGModelObject.cpp
+++ b/Source/core/layout/svg/LayoutSVGModelObject.cpp
@@ -51,17 +51,17 @@ bool LayoutSVGModelObject::isChildAllowed(LayoutObject* child, const LayoutStyle
     return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText());
 }
 
-LayoutRect LayoutSVGModelObject::clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
+LayoutRect LayoutSVGModelObject::clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
 {
     return SVGLayoutSupport::clippedOverflowRectForPaintInvalidation(this, paintInvalidationContainer, paintInvalidationState);
 }
 
-void LayoutSVGModelObject::mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
+void LayoutSVGModelObject::mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
 {
     SVGLayoutSupport::mapLocalToContainer(this, paintInvalidationContainer, transformState, wasFixed, paintInvalidationState);
 }
 
-const LayoutObject* LayoutSVGModelObject::pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const
+const LayoutObject* LayoutSVGModelObject::pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap& geometryMap) const
 {
     return SVGLayoutSupport::pushMappingToContainer(this, ancestorToStopAt, geometryMap);
 }