| Index: Source/platform/graphics/Image.h
|
| diff --git a/Source/platform/graphics/Image.h b/Source/platform/graphics/Image.h
|
| index 78528f358ff144b848d3579a5c2d50c4edd289f1..825ff21245c395389b829253b3fee0a81f9978ab 100644
|
| --- a/Source/platform/graphics/Image.h
|
| +++ b/Source/platform/graphics/Image.h
|
| @@ -119,7 +119,7 @@ public:
|
|
|
| virtual void drawPattern(GraphicsContext*, const FloatRect&,
|
| const FloatSize&, const FloatPoint& phase, CompositeOperator,
|
| - const FloatRect&, blink::WebBlendMode = blink::WebBlendModeNormal, const IntSize& repeatSpacing = IntSize());
|
| + const FloatRect&, WebBlendMode = WebBlendModeNormal, const IntSize& repeatSpacing = IntSize());
|
|
|
| #if ENABLE(ASSERT)
|
| virtual bool notSolidColor() { return true; }
|
| @@ -131,10 +131,10 @@ protected:
|
| static void fillWithSolidColor(GraphicsContext*, const FloatRect& dstRect, const Color&, CompositeOperator);
|
| static FloatRect adjustForNegativeSize(const FloatRect&); // A helper method for translating negative width and height values.
|
|
|
| - virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, blink::WebBlendMode) = 0;
|
| - virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, blink::WebBlendMode, RespectImageOrientationEnum);
|
| + virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, WebBlendMode) = 0;
|
| + virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, WebBlendMode, RespectImageOrientationEnum);
|
| void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
|
| - CompositeOperator, blink::WebBlendMode, const IntSize& repeatSpacing);
|
| + CompositeOperator, WebBlendMode, const IntSize& repeatSpacing);
|
| void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, CompositeOperator);
|
|
|
| // Supporting tiled drawing
|
| @@ -149,6 +149,6 @@ private:
|
| #define DEFINE_IMAGE_TYPE_CASTS(typeName) \
|
| DEFINE_TYPE_CASTS(typeName, Image, image, image->is##typeName(), image.is##typeName())
|
|
|
| -}
|
| +} // namespace blink
|
|
|
| #endif
|
|
|