| Index: Source/platform/graphics/GraphicsContext.h
|
| diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
|
| index a17a323cc3706beaaf7dbf7b0a1d5a39603ef24a..798e1e9731bb1ce9daba14384c69a6539a43e262 100644
|
| --- a/Source/platform/graphics/GraphicsContext.h
|
| +++ b/Source/platform/graphics/GraphicsContext.h
|
| @@ -186,7 +186,6 @@ public:
|
| SkXfermode::Mode compositeOperation() const;
|
| // TODO(dshwang): remove these method. crbug.com/425656
|
| CompositeOperator compositeOperationDeprecated() const;
|
| - WebBlendMode blendModeOperation() const;
|
|
|
| // Specify the device scale factor which may change the way document markers
|
| // and fonts are rendered.
|
| @@ -264,17 +263,16 @@ public:
|
| void drawPicture(const SkPicture*);
|
| void compositePicture(SkPicture*, const FloatRect& dest, const FloatRect& src, CompositeOperator, WebBlendMode);
|
|
|
| - void drawImage(Image*, const IntPoint&, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| - void drawImage(Image*, const IntRect&, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| + void drawImage(Image*, const IntPoint&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| + void drawImage(Image*, const IntRect&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| void drawImage(Image*, const FloatRect& destRect);
|
| - void drawImage(Image*, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator = CompositeSourceOver, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| - void drawImage(Image*, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, WebBlendMode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| + void drawImage(Image*, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
|
|
| void drawTiledImage(Image*, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize,
|
| - CompositeOperator = CompositeSourceOver, WebBlendMode = WebBlendModeNormal, const IntSize& repeatSpacing = IntSize());
|
| + SkXfermode::Mode = SkXfermode::kSrcOver_Mode, const IntSize& repeatSpacing = IntSize());
|
| void drawTiledImage(Image*, const IntRect& destRect, const IntRect& srcRect,
|
| const FloatSize& tileScaleFactor, Image::TileRule hRule = Image::StretchTile, Image::TileRule vRule = Image::StretchTile,
|
| - CompositeOperator = CompositeSourceOver);
|
| + SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
|
|
|
| void drawImageBuffer(ImageBuffer*, const FloatRect& destRect, const FloatRect* srcRect = 0, CompositeOperator = CompositeSourceOver, WebBlendMode = WebBlendModeNormal);
|
|
|
| @@ -385,8 +383,7 @@ public:
|
| SkPaint*,
|
| const SkRect& srcRect,
|
| const SkRect& destRect,
|
| - CompositeOperator,
|
| - WebBlendMode,
|
| + SkXfermode::Mode,
|
| bool isBitmapWithAlpha,
|
| bool isLazyDecoded = false,
|
| bool isDataComplete = true) const;
|
|
|