Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/svg/LayoutSVGBlock.h

Index: Source/core/layout/svg/LayoutSVGBlock.h
diff --git a/Source/core/layout/svg/LayoutSVGBlock.h b/Source/core/layout/svg/LayoutSVGBlock.h
index 9dba595bc8f00394245bcde9ec373eb35a7a1fdc..e7d53ed816db6dee51666b3277b5992b64d19cd7 100644
--- a/Source/core/layout/svg/LayoutSVGBlock.h
+++ b/Source/core/layout/svg/LayoutSVGBlock.h
@@ -32,10 +32,10 @@ public:
 
     virtual LayoutRect visualOverflowRect() const override final;
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override final;
+    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override final;
 
-    virtual void mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
-    virtual const LayoutObject* pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, LayoutGeometryMap&) const override final;
+    virtual void mapLocalToContainer(const LayoutBoxModelObject* paintInvalidationContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0, const PaintInvalidationState* = 0) const override final;
+    virtual const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override final;
 
     virtual AffineTransform localTransform() const override final { return m_localTransform; }
 
@@ -48,7 +48,7 @@ public:
 
 protected:
     virtual void willBeDestroyed() override;
-    virtual void mapRectToPaintInvalidationBacking(const LayoutLayerModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override final;
+    virtual void mapRectToPaintInvalidationBacking(const LayoutBoxModelObject* paintInvalidationContainer, LayoutRect&, const PaintInvalidationState*) const override final;
 
     AffineTransform m_localTransform;