| Index: Source/core/paint/BoxPainter.h | 
| diff --git a/Source/core/paint/BoxPainter.h b/Source/core/paint/BoxPainter.h | 
| index a76f562472153ce5b66521f3e31a46f983b7647b..3a132705434640b822a2903d56270070e4b5b3ae 100644 | 
| --- a/Source/core/paint/BoxPainter.h | 
| +++ b/Source/core/paint/BoxPainter.h | 
| @@ -31,9 +31,9 @@ public: | 
| static void paintFillLayerExtended(LayoutBoxModelObject&, 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(LayoutBoxModelObject&, const LayoutBoxModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, LayoutObject* = 0); | 
| static InterpolationQuality chooseInterpolationQuality(LayoutObject&, GraphicsContext*, Image*, const void*, const LayoutSize&); | 
| -    static bool paintNinePieceImage(LayoutBoxModelObject&, GraphicsContext*, const LayoutRect&, const LayoutStyle&, const NinePieceImage&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode); | 
| -    static void paintBorder(LayoutBoxModelObject&, const PaintInfo&, const LayoutRect&, const LayoutStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true); | 
| -    static void paintBoxShadow(const PaintInfo&, const LayoutRect&, const LayoutStyle&, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true); | 
| +    static bool paintNinePieceImage(LayoutBoxModelObject&, GraphicsContext*, const LayoutRect&, const ComputedStyle&, const NinePieceImage&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode); | 
| +    static void paintBorder(LayoutBoxModelObject&, const PaintInfo&, const LayoutRect&, const ComputedStyle&, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true); | 
| +    static void paintBoxShadow(const PaintInfo&, const LayoutRect&, const ComputedStyle&, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true); | 
| static bool shouldAntialiasLines(GraphicsContext*); | 
|  | 
| private: | 
| @@ -48,17 +48,17 @@ private: | 
| static void applyBoxShadowForBackground(GraphicsContext*, LayoutObject&); | 
| static bool fixedBackgroundPaintsInLocalCoordinates(const LayoutObject&); | 
| static IntSize calculateFillTileSize(const LayoutBoxModelObject&, const FillLayer&, const IntSize& scaledPositioningAreaSize); | 
| -    static void paintTranslucentBorderSides(GraphicsContext*, const LayoutStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, const IntPoint& innerBorderAdjustment, | 
| +    static void paintTranslucentBorderSides(GraphicsContext*, const ComputedStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, const IntPoint& innerBorderAdjustment, | 
| const BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false); | 
| static LayoutRect borderInnerRectAdjustedForBleedAvoidance(GraphicsContext*, const LayoutRect&, BackgroundBleedAvoidance); | 
| -    static void paintOneBorderSide(GraphicsContext*, const LayoutStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, | 
| +    static void paintOneBorderSide(GraphicsContext*, const ComputedStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, | 
| const FloatRect& sideRect, BoxSide, BoxSide adjacentSide1, BoxSide adjacentSide2, const BorderEdge[], | 
| const Path*, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias, const Color* overrideColor = 0); | 
| -    static void paintBorderSides(GraphicsContext*, const LayoutStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, | 
| +    static void paintBorderSides(GraphicsContext*, const ComputedStyle&, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, | 
| const IntPoint& innerBorderAdjustment, const BorderEdge[], BorderEdgeFlags, BackgroundBleedAvoidance, | 
| bool includeLogicalLeftEdge, bool includeLogicalRightEdge, bool antialias = false, const Color* overrideColor = 0); | 
| static void drawBoxSideFromPath(GraphicsContext*, const LayoutRect&, const Path&, const BorderEdge[], | 
| -        float thickness, float drawThickness, BoxSide, const LayoutStyle&, | 
| +        float thickness, float drawThickness, BoxSide, const ComputedStyle&, | 
| Color, EBorderStyle, BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge); | 
| static void clipBorderSidePolygon(GraphicsContext*, const FloatRoundedRect& outerBorder, const FloatRoundedRect& innerBorder, | 
| BoxSide, bool firstEdgeMatches, bool secondEdgeMatches); | 
|  |