Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutReplaced.h

Index: Source/core/layout/LayoutReplaced.h
diff --git a/Source/core/layout/LayoutReplaced.h b/Source/core/layout/LayoutReplaced.h
index ff935d73e9af330af2153eec2890357e14882a44..6033b3874ab43391a17b3fceb4f16743c85ad81f 100644
--- a/Source/core/layout/LayoutReplaced.h
+++ b/Source/core/layout/LayoutReplaced.h
@@ -79,13 +79,13 @@ protected:
 private:
     virtual void computePreferredLogicalWidths() override final;
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
+    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
 
     virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override final;
 
     virtual bool canBeSelectionLeaf() const override { return true; }
 
-    virtual LayoutRect selectionRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer) const override final;
+    virtual LayoutRect selectionRectForPaintInvalidation(const RenderBoxModelObject* paintInvalidationContainer) const override final;
     void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio) const;
 
     mutable LayoutSize m_intrinsicSize;