Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/paint/ViewDisplayListTest.cpp

Index: Source/core/paint/ViewDisplayListTest.cpp
diff --git a/Source/core/paint/ViewDisplayListTest.cpp b/Source/core/paint/ViewDisplayListTest.cpp
index 97a8fd8d0463673cfb9c8fb20cdff7a23ba66b3f..884df37ea85947791c7d77a78bf8c3f1c76c581a 100644
--- a/Source/core/paint/ViewDisplayListTest.cpp
+++ b/Source/core/paint/ViewDisplayListTest.cpp
@@ -94,7 +94,7 @@ void drawRect(GraphicsContext* context, LayoutObject* renderer, PaintPhase phase
     context->drawRect(rect);
 }
 
-void drawClippedRect(GraphicsContext* context, LayoutLayerModelObject* renderer, PaintPhase phase, const FloatRect& bound)
+void drawClippedRect(GraphicsContext* context, LayoutBoxModelObject* renderer, PaintPhase phase, const FloatRect& bound)
 {
     IntRect rect(1, 1, 9, 9);
     ClipRect clipRect(rect);
@@ -337,8 +337,8 @@ TEST_F(ViewDisplayListTest, UpdateAddLastOverlap)
 TEST_F(ViewDisplayListTest, UpdateClip)
 {
     setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
-    LayoutLayerModelObject* firstRenderer = toLayoutLayerModelObject(document().body()->firstChild()->renderer());
-    LayoutLayerModelObject* secondRenderer = toLayoutLayerModelObject(document().body()->firstChild()->firstChild()->renderer());
+    LayoutBoxModelObject* firstRenderer = toLayoutBoxModelObject(document().body()->firstChild()->renderer());
+    LayoutBoxModelObject* secondRenderer = toLayoutBoxModelObject(document().body()->firstChild()->firstChild()->renderer());
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     ClipRect firstClipRect(IntRect(1, 1, 2, 2));
@@ -385,8 +385,8 @@ TEST_F(ViewDisplayListTest, CachedDisplayItems)
     RuntimeEnabledFeatures::setSlimmingPaintDisplayItemCacheEnabled(true);
 
     setBodyInnerHTML("<div id='first'><div id='second'></div></div>");
-    LayoutLayerModelObject* firstRenderer = toLayoutLayerModelObject(document().body()->firstChild()->renderer());
-    LayoutLayerModelObject* secondRenderer = toLayoutLayerModelObject(document().body()->firstChild()->firstChild()->renderer());
+    LayoutBoxModelObject* firstRenderer = toLayoutBoxModelObject(document().body()->firstChild()->renderer());
+    LayoutBoxModelObject* secondRenderer = toLayoutBoxModelObject(document().body()->firstChild()->firstChild()->renderer());
     GraphicsContext context(nullptr, &rootDisplayItemList());
 
     drawRect(&context, firstRenderer, PaintPhaseBlockBackground, FloatRect(100, 100, 150, 150));