Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/PaintInfo.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 23 matching lines @@
 #include "platform/graphics/paint/DisplayItem.h"
 #include "platform/transforms/AffineTransform.h"
 #include "wtf/HashMap.h"
 #include "wtf/ListHashSet.h"
 
 #include <limits>
 
 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)
         , paintBehavior(newPaintBehavior)
         , paintingRoot(newPaintingRoot)
         , m_paintContainer(newPaintContainer)
         , m_outlineObjects(newOutlineObjects)
     {
     }
 
@@ skipping 15 matching lines @@
     }
 
     bool forceBlackText() const { return paintBehavior & PaintBehaviorForceBlackText; }
     bool isRenderingClipPathAsMaskImage() const { return paintBehavior & PaintBehaviorRenderingClipPathAsMask; }
 
     bool skipRootBackground() const { return paintBehavior & PaintBehaviorSkipRootBackground; }
     bool paintRootBackgroundOnly() const { return paintBehavior & PaintBehaviorRootBackgroundOnly; }
 
     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; }
 
     // FIXME: Introduce setters/getters at some point. Requires a lot of changes throughout rendering/.
     GraphicsContext* context;
     IntRect rect; // dirty rect used for culling non-intersecting renderers
     PaintPhase phase;
     PaintBehavior paintBehavior;
     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
 };
 
 } // namespace blink
 
 #endif // PaintInfo_h