Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/PaintInfo.h

Index: Source/core/layout/PaintInfo.h
diff --git a/Source/core/layout/PaintInfo.h b/Source/core/layout/PaintInfo.h
index b8d121236972fe0363af9304be40278c7cb4da12..28b0a492e4191214a045923dbcbecfea3b550638 100644
--- a/Source/core/layout/PaintInfo.h
+++ b/Source/core/layout/PaintInfo.h
@@ -41,13 +41,13 @@
 namespace blink {
 
 class RenderInline;
-class LayoutLayerModelObject;
+class LayoutBoxModelObject;
 class LayoutObject;
 
 struct PaintInfo {
     PaintInfo(GraphicsContext* newContext, const IntRect& newRect, PaintPhase newPhase, PaintBehavior newPaintBehavior,
         LayoutObject* newPaintingRoot = 0, ListHashSet<RenderInline*>* newOutlineObjects = 0,
-        const LayoutLayerModelObject* newPaintContainer = 0)
+        const LayoutBoxModelObject* newPaintContainer = 0)
         : context(newContext)
         , rect(newRect)
         , phase(newPhase)
@@ -83,7 +83,7 @@ struct PaintInfo {
 
     DisplayItem::Type displayItemTypeForClipping() const { return DisplayItem::paintPhaseToClipBoxType(phase); }
 
-    const LayoutLayerModelObject* paintContainer() const { return m_paintContainer; }
+    const LayoutBoxModelObject* paintContainer() const { return m_paintContainer; }
 
     ListHashSet<RenderInline*>* outlineObjects() const { return m_outlineObjects; }
     void setOutlineObjects(ListHashSet<RenderInline*>* objects) { m_outlineObjects = objects; }
@@ -96,7 +96,7 @@ struct PaintInfo {
     LayoutObject* paintingRoot; // used to draw just one element and its visual kids
 
 private:
-    const LayoutLayerModelObject* m_paintContainer; // the layer object that originates the current painting
+    const LayoutBoxModelObject* m_paintContainer; // the box model object that originates the current painting
     ListHashSet<RenderInline*>* m_outlineObjects; // used to list outlines that should be painted by a block with inline children
 };