Index: third_party/WebKit/Source/platform/graphics/BitmapImage.h |
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImage.h b/third_party/WebKit/Source/platform/graphics/BitmapImage.h |
index a0b1e9d41b590f7a18c384a188cf8e805771b85b..24cee8a90cbd44e143849cc94348b4ca735f50b8 100644 |
--- a/third_party/WebKit/Source/platform/graphics/BitmapImage.h |
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImage.h |
@@ -29,7 +29,6 @@ |
#define BitmapImage_h |
#include "platform/geometry/IntSize.h" |
-#include "platform/graphics/Color.h" |
#include "platform/graphics/FrameData.h" |
#include "platform/graphics/Image.h" |
#include "platform/graphics/ImageAnimationPolicy.h" |
@@ -54,12 +53,9 @@ public: |
return adoptRef(new BitmapImage(observer)); |
} |
- // This allows constructing a BitmapImage with a forced non-default orientation. |
- static PassRefPtr<BitmapImage> createWithOrientationForTesting(const SkBitmap&, ImageOrientation); |
- |
~BitmapImage() override; |
- bool isBitmapImage() const override; |
+ bool isBitmapImage() const override { return true; } |
bool currentFrameHasSingleSecurityOrigin() const override; |
@@ -70,7 +66,10 @@ public: |
bool dataChanged(bool allDataReceived) override; |
bool isAllDataReceived() const { return m_allDataReceived; } |
+ |
bool hasColorProfile() const; |
+ PassRefPtr<ColorSpaceProfile> colorProfile() const { return m_source.colorProfile(); } |
+ PassRefPtr<SkColorFilter> imageColorTransform(); |
// It may look unusual that there's no start animation call as public API. |
// This because we start and stop animating lazily. Animation starts when |
@@ -84,17 +83,24 @@ public: |
ImageAnimationPolicy animationPolicy() override { return m_animationPolicy; } |
void advanceTime(double deltaTimeInSeconds) override; |
- // Advance the image animation by one frame. |
- void advanceAnimationForTesting() override { internalAdvanceAnimation(false); } |
- |
PassRefPtr<SkImage> imageForCurrentFrame() override; |
PassRefPtr<Image> imageForDefaultFrame() override; |
+ |
bool currentFrameKnownToBeOpaque(MetadataMode = UseCurrentMetadata) override; |
bool currentFrameIsComplete() override; |
bool currentFrameIsLazyDecoded() override; |
+ PassRefPtr<SkImage> pictureForCurrentFrame(); |
+ |
+ // FIXME: consider renaming this to orientationForCurrentFrame(), or perhaps |
+ // imageOrientation, since orientation is the same for all image frames. |
ImageOrientation currentFrameOrientation(); |
+ // Construct a BitmapImage with the given orientation. |
+ static PassRefPtr<BitmapImage> createWithOrientationForTesting(const SkBitmap&, ImageOrientation); |
+ // Advance an animated image by one frame. |
+ void advanceAnimationForTesting() override { internalAdvanceAnimation(false); } |
+ |
private: |
friend class BitmapImageTest; |