Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutBR.h

Index: Source/core/layout/LayoutBR.h
diff --git a/Source/core/layout/LayoutBR.h b/Source/core/layout/LayoutBR.h
index ef61b8697b21c760ab6b44d00104cacfec39dd00..9a9e810f8b1e1e23610b8dcdb3f77afbff03a472 100644
--- a/Source/core/layout/LayoutBR.h
+++ b/Source/core/layout/LayoutBR.h
@@ -36,7 +36,7 @@ public:
 
     virtual const char* renderName() const override { return "LayoutBR"; }
 
-    virtual LayoutRect selectionRectForPaintInvalidation(const LayoutLayerModelObject* /*paintInvalidationContainer*/) const override { return LayoutRect(); }
+    virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* /*paintInvalidationContainer*/) const override { return LayoutRect(); }
 
     virtual float width(unsigned /*from*/, unsigned /*len*/, const Font&, float /*xPos*/, TextDirection, HashSet<const SimpleFontData*>* = 0 /*fallbackFonts*/ , GlyphOverflow* = 0) const override { return 0; }
     virtual float width(unsigned /*from*/, unsigned /*len*/, float /*xpos*/, TextDirection, bool = false /*firstLine*/, HashSet<const SimpleFontData*>* = 0 /*fallbackFonts*/, GlyphOverflow* = 0) const override { return 0; }