| Index: Source/core/paint/BoxPainter.h
|
| diff --git a/Source/core/paint/BoxPainter.h b/Source/core/paint/BoxPainter.h
|
| index 5348481e2ddc2d12afe54dd910ef7b3e109d1bf3..a0e24166b346fc5a0666fcb3d5c6fea6a1d29639 100644
|
| --- a/Source/core/paint/BoxPainter.h
|
| +++ b/Source/core/paint/BoxPainter.h
|
| @@ -25,14 +25,14 @@ public:
|
| void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&);
|
| void paintMask(const PaintInfo&, const LayoutPoint&);
|
| void paintClippingMask(const PaintInfo&, const LayoutPoint&);
|
| - void paintFillLayers(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone, CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0);
|
| + void paintFillLayers(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance = BackgroundBleedNone, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RenderObject* backgroundObject = 0);
|
| 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(), CompositeOperator = CompositeSourceOver, RenderObject* backgroundObject = 0, bool skipBaseColor = false);
|
| + static void paintFillLayerExtended(RenderBoxModelObject&, const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox* = 0, const LayoutSize& = LayoutSize(), SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RenderObject* backgroundObject = 0, bool skipBaseColor = false);
|
| static void calculateBackgroundImageGeometry(RenderBoxModelObject&, const RenderLayerModelObject* paintContainer, const FillLayer&, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderObject* = 0);
|
| static InterpolationQuality chooseInterpolationQuality(RenderBoxModelObject&, GraphicsContext*, Image*, const void*, const LayoutSize&);
|
| static void clipRoundedInnerRect(GraphicsContext*, const LayoutRect&, const FloatRoundedRect& clipRect);
|
| - static bool paintNinePieceImage(RenderBoxModelObject&, GraphicsContext*, const LayoutRect&, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
|
| + static bool paintNinePieceImage(RenderBoxModelObject&, GraphicsContext*, const LayoutRect&, const RenderStyle*, const NinePieceImage&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
|
| static void paintBorder(RenderBoxModelObject&, const PaintInfo&, const LayoutRect&, const RenderStyle*, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
|
| static void paintBoxShadow(const PaintInfo&, const LayoutRect&, const RenderStyle*, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
|
| static bool shouldAntialiasLines(GraphicsContext*);
|
| @@ -40,7 +40,7 @@ public:
|
| private:
|
| void paintBackground(const PaintInfo&, const LayoutRect&, const Color& backgroundColor, BackgroundBleedAvoidance = BackgroundBleedNone);
|
| void paintRootBoxFillLayers(const PaintInfo&);
|
| - void paintFillLayer(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, CompositeOperator, RenderObject* backgroundObject, bool skipBaseColor = false);
|
| + void paintFillLayer(const PaintInfo&, const Color&, const FillLayer&, const LayoutRect&, BackgroundBleedAvoidance, SkXfermode::Mode, RenderObject* backgroundObject, bool skipBaseColor = false);
|
| static void paintRootBackgroundColor(RenderObject&, const PaintInfo&, const LayoutRect&, const Color&);
|
| static FloatRoundedRect backgroundRoundedRectAdjustedForBleedAvoidance(RenderObject&, GraphicsContext*, const LayoutRect&, BackgroundBleedAvoidance, InlineFlowBox*, const LayoutSize&, bool includeLogicalLeftEdge, bool includeLogicalRightEdge);
|
| static FloatRoundedRect getBackgroundRoundedRect(RenderObject&, const LayoutRect&, InlineFlowBox*, LayoutUnit inlineBoxWidth, LayoutUnit inlineBoxHeight,
|
|
|