Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/paint/BoxPainter.h

Index: Source/core/paint/BoxPainter.h
diff --git a/Source/core/paint/BoxPainter.h b/Source/core/paint/BoxPainter.h
index b49c29ed23a51e0b56035cf8ec55caef6befd220..1605fc8a4d3c225291cf3688e8fec21cc3d1a2e9 100644
--- a/Source/core/paint/BoxPainter.h
+++ b/Source/core/paint/BoxPainter.h
@@ -29,7 +29,7 @@ public:
     void paintMaskImages(const PaintInfo&, const LayoutRect&);
     void paintBoxDecorationBackgroundWithRect(const PaintInfo&, const LayoutPoint&, const LayoutRect&);
     static void paintFillLayerExtended(RenderBoxModelObject&, const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const LayoutSize& = LayoutSize(), SkXfermode::Mode = SkXfermode::kSrcOver_Mode, LayoutObject* backgroundObject = 0, bool skipBaseColor = false);
-    static void calculateBackgroundImageGeometry(RenderBoxModelObject&, const LayoutLayerModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, LayoutObject* = 0);
+    static void calculateBackgroundImageGeometry(RenderBoxModelObject&, const RenderBoxModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, LayoutObject* = 0);
     static InterpolationQuality chooseInterpolationQuality(RenderBoxModelObject&, GraphicsContext*, Image*, const void*, const LayoutSize&);
     static bool paintNinePieceImage(RenderBoxModelObject&, GraphicsContext*, const LayoutRect&, const LayoutStyle&, const NinePieceImage&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
     static void paintBorder(RenderBoxModelObject&, const PaintInfo&, const LayoutRect&, const LayoutStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);