| Index: Source/core/platform/image-decoders/ImageDecoder.h
|
| diff --git a/Source/core/platform/image-decoders/ImageDecoder.h b/Source/core/platform/image-decoders/ImageDecoder.h
|
| index e58d53fffa1973458b4a6ba836295b48061f1308..3009a7043159a215a3c4acb5f920c1380f5a01f2 100644
|
| --- a/Source/core/platform/image-decoders/ImageDecoder.h
|
| +++ b/Source/core/platform/image-decoders/ImageDecoder.h
|
| @@ -207,10 +207,9 @@ namespace WebCore {
|
| RefPtr<NativeImageSkia> m_bitmap;
|
| SkBitmap::Allocator* m_allocator;
|
| bool m_hasAlpha;
|
| - IntRect m_originalFrameRect; // This will always just be the entire
|
| - // buffer except for GIF frames whose
|
| - // original rect was smaller than the
|
| - // overall image size.
|
| + // This will always just be the entire buffer except for GIF or WebP
|
| + // frames whose original rect was smaller than the overall image size.
|
| + IntRect m_originalFrameRect;
|
| FrameStatus m_status;
|
| unsigned m_duration;
|
| FrameDisposalMethod m_disposalMethod;
|
| @@ -269,9 +268,9 @@ namespace WebCore {
|
|
|
| // This will only differ from size() for ICO (where each frame is a
|
| // different icon) or other formats where different frames are different
|
| - // sizes. This does NOT differ from size() for GIF, since decoding GIFs
|
| - // composites any smaller frames against previous frames to create full-
|
| - // size frames.
|
| + // sizes. This does NOT differ from size() for GIF or WebP, since
|
| + // decoding GIF or WebP composites any smaller frames against previous
|
| + // frames to create full-size frames.
|
| virtual IntSize frameSizeAtIndex(size_t) const
|
| {
|
| return size();
|
| @@ -388,7 +387,7 @@ namespace WebCore {
|
| // decode this frame. Callers may pass WTF::notFound to clear all frames.
|
| //
|
| // Returns the number of bytes of frame data actually cleared.
|
| - size_t clearCacheExceptFrame(size_t);
|
| + virtual size_t clearCacheExceptFrame(size_t);
|
|
|
| // If the image has a cursor hot-spot, stores it in the argument
|
| // and returns true. Otherwise returns false.
|
|
|