| Index: Source/core/platform/graphics/Image.h
|
| diff --git a/Source/core/platform/graphics/Image.h b/Source/core/platform/graphics/Image.h
|
| index 625a09126072ad8a54c6b99b0439771a18b6b893..c0fc6e94e706334b7054ae1fdc05f9a088b83eaa 100644
|
| --- a/Source/core/platform/graphics/Image.h
|
| +++ b/Source/core/platform/graphics/Image.h
|
| @@ -28,7 +28,6 @@
|
| #define Image_h
|
|
|
| #include "core/platform/graphics/Color.h"
|
| -#include "core/platform/graphics/ColorSpace.h"
|
| #include "core/platform/graphics/GraphicsTypes.h"
|
| #include "core/platform/graphics/ImageOrientation.h"
|
| #include "core/platform/graphics/IntRect.h"
|
| @@ -61,7 +60,7 @@ class Image : public RefCounted<Image> {
|
|
|
| public:
|
| virtual ~Image();
|
| -
|
| +
|
| static PassRefPtr<Image> create(ImageObserver* = 0);
|
| static PassRefPtr<Image> loadPlatformResource(const char* name);
|
| static bool supportsType(const String&);
|
| @@ -91,7 +90,7 @@ public:
|
|
|
| bool setData(PassRefPtr<SharedBuffer> data, bool allDataReceived);
|
| virtual bool dataChanged(bool /*allDataReceived*/) { return false; }
|
| -
|
| +
|
| virtual String filenameExtension() const { return String(); } // null string if unknown
|
|
|
| virtual void destroyDecodedData() = 0;
|
| @@ -104,7 +103,7 @@ public:
|
| virtual void startAnimation(bool /*catchUpIfNecessary*/ = true) { }
|
| virtual void stopAnimation() {}
|
| virtual void resetAnimation() {}
|
| -
|
| +
|
| // Typically the CachedImage that owns us.
|
| ImageObserver* imageObserver() const { return m_imageObserver; }
|
| void setImageObserver(ImageObserver* observer) { m_imageObserver = observer; }
|
| @@ -114,7 +113,7 @@ public:
|
| virtual PassNativeImagePtr nativeImageForCurrentFrame() { return 0; }
|
|
|
| virtual void drawPattern(GraphicsContext*, const FloatRect& srcRect, const AffineTransform& patternTransform,
|
| - const FloatPoint& phase, ColorSpace styleColorSpace, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
|
| + const FloatPoint& phase, CompositeOperator, const FloatRect& destRect, BlendMode = BlendModeNormal);
|
|
|
| #if !ASSERT_DISABLED
|
| virtual bool notSolidColor() { return true; }
|
| @@ -125,23 +124,22 @@ public:
|
| protected:
|
| Image(ImageObserver* = 0);
|
|
|
| - static void fillWithSolidColor(GraphicsContext*, const FloatRect& dstRect, const Color&, ColorSpace styleColorSpace, CompositeOperator);
|
| + 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.
|
|
|
| // FIXME (crbug.com/242060): This does not belong on Image.
|
| static void paintSkBitmap(GraphicsContext*, const NativeImageSkia&, const SkRect& /*srcRect*/, const SkRect& /*destRect*/, const SkXfermode::Mode&);
|
|
|
| - // The ColorSpace parameter will only be used for untagged images.
|
| - virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode) = 0;
|
| - virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, ColorSpace styleColorSpace, CompositeOperator, BlendMode, RespectImageOrientationEnum);
|
| - void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize, ColorSpace styleColorSpace,
|
| + virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode) = 0;
|
| + virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, BlendMode, RespectImageOrientationEnum);
|
| + void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,
|
| CompositeOperator , BlendMode);
|
| - void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, ColorSpace styleColorSpace, CompositeOperator);
|
| + void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, const FloatSize& tileScaleFactor, TileRule hRule, TileRule vRule, CompositeOperator);
|
|
|
| // Supporting tiled drawing
|
| virtual bool mayFillWithSolidColor() { return false; }
|
| virtual Color solidColor() const { return Color(); }
|
| -
|
| +
|
| private:
|
| RefPtr<SharedBuffer> m_encodedImageData;
|
| ImageObserver* m_imageObserver;
|
|
|