Index: Source/platform/graphics/BitmapImage.h |
diff --git a/Source/platform/graphics/BitmapImage.h b/Source/platform/graphics/BitmapImage.h |
index 9b2c9f851ea8e78067f2c3a5f0f138d703a932da..3a35c5e8f773530b2471c5b38cffea80eb745853 100644 |
--- a/Source/platform/graphics/BitmapImage.h |
+++ b/Source/platform/graphics/BitmapImage.h |
@@ -30,11 +30,12 @@ |
#include "platform/geometry/IntSize.h" |
#include "platform/graphics/Color.h" |
+#include "platform/graphics/ColorSpaceProfile.h" |
#include "platform/graphics/FrameData.h" |
+#include "platform/graphics/GraphicsScreen.h" |
#include "platform/graphics/Image.h" |
#include "platform/graphics/ImageOrientation.h" |
#include "platform/graphics/ImageSource.h" |
-#include "wtf/Forward.h" |
namespace WebCore { |
@@ -67,8 +68,9 @@ public: |
virtual bool getHotSpot(IntPoint&) const OVERRIDE; |
virtual bool dataChanged(bool allDataReceived) OVERRIDE; |
- bool isAllDataReceived() const; |
- bool hasColorProfile() const; |
+ bool isAllDataReceived() const { return m_allDataReceived; } |
+ bool hasColorProfile() const { return m_source.hasColorProfile(); } |
+ PassRefPtr<ColorSpaceProfile> colorProfile() const { return m_source.colorProfile(); } |
virtual String filenameExtension() const OVERRIDE; |
// It may look unusual that there is no start animation call as public API. This is because |
@@ -89,7 +91,9 @@ public: |
private: |
friend class BitmapImageTest; |
+ friend class ImageResource; |
+ void resetDecoder(); |
void updateSize() const; |
protected: |
@@ -104,6 +108,7 @@ protected: |
virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, blink::WebBlendMode) OVERRIDE; |
virtual void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator, blink::WebBlendMode, RespectImageOrientationEnum) OVERRIDE; |
+ virtual void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint& phase, CompositeOperator, const FloatRect&, blink::WebBlendMode = blink::WebBlendModeNormal, const IntSize& repeatSpacing = IntSize()) OVERRIDE; |
size_t currentFrame() const { return m_currentFrame; } |
size_t frameCount(); |