| Index: Source/platform/graphics/GraphicsContext.h
|
| diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
|
| index eb758816a6a61988feb0b0a6709824c2866028aa..87aa504bbcf46a6a0f6bab6fe324f17cd5443f35 100644
|
| --- a/Source/platform/graphics/GraphicsContext.h
|
| +++ b/Source/platform/graphics/GraphicsContext.h
|
| @@ -181,9 +181,9 @@ public:
|
| void setImageInterpolationQuality(InterpolationQuality quality) { mutableState()->setInterpolationQuality(quality); }
|
| InterpolationQuality imageInterpolationQuality() const { return immutableState()->interpolationQuality(); }
|
|
|
| - void setCompositeOperation(CompositeOperator, blink::WebBlendMode = blink::WebBlendModeNormal);
|
| + void setCompositeOperation(CompositeOperator, WebBlendMode = WebBlendModeNormal);
|
| CompositeOperator compositeOperation() const { return immutableState()->compositeOperator(); }
|
| - blink::WebBlendMode blendModeOperation() const { return immutableState()->blendMode(); }
|
| + WebBlendMode blendModeOperation() const { return immutableState()->blendMode(); }
|
|
|
| // Speicy the device scale factor which may change the way document markers
|
| // and fonts are rendered.
|
| @@ -273,17 +273,17 @@ public:
|
| void drawImage(Image*, const IntRect&, CompositeOperator = CompositeSourceOver, 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, blink::WebBlendMode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
| + void drawImage(Image*, const FloatRect& destRect, const FloatRect& srcRect, CompositeOperator, WebBlendMode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
|
|
|
| void drawTiledImage(Image*, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize,
|
| - CompositeOperator = CompositeSourceOver, blink::WebBlendMode = blink::WebBlendModeNormal, const IntSize& repeatSpacing = IntSize());
|
| + CompositeOperator = CompositeSourceOver, WebBlendMode = WebBlendModeNormal, 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);
|
|
|
| void drawImageBuffer(ImageBuffer*, const FloatRect& destRect, const FloatRect* srcRect = 0, CompositeOperator = CompositeSourceOver, WebBlendMode = WebBlendModeNormal);
|
|
|
| - void drawPicture(PassRefPtr<SkPicture>, const FloatRect& dest, const FloatRect& src, CompositeOperator, blink::WebBlendMode);
|
| + void drawPicture(PassRefPtr<SkPicture>, const FloatRect& dest, const FloatRect& src, CompositeOperator, WebBlendMode);
|
|
|
| // These methods write to the canvas and modify the opaque region, if tracked.
|
| // Also drawLine(const IntPoint& point1, const IntPoint& point2) and fillRoundedRect
|
| @@ -404,7 +404,7 @@ public:
|
| const SkRect& srcRect,
|
| const SkRect& destRect,
|
| CompositeOperator,
|
| - blink::WebBlendMode,
|
| + WebBlendMode,
|
| bool isLazyDecoded = false,
|
| bool isDataComplete = true) const;
|
|
|
|
|