| 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 13f6f17813c2c4928611cb47b4c32df5605cd8f6..a4d35a9ca16354302bfe104ed3396a4706cc4fda 100644
|
| --- a/Source/core/platform/image-decoders/ImageDecoder.h
|
| +++ b/Source/core/platform/image-decoders/ImageDecoder.h
|
| @@ -195,10 +195,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;
|
| @@ -259,9 +258,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();
|
| @@ -367,8 +366,8 @@ namespace WebCore {
|
| bool failed() const { return m_failed; }
|
|
|
| // Clears decoded pixel data from before the provided frame unless that
|
| - // data may be needed to decode future frames (e.g. due to GIF frame
|
| - // compositing).
|
| + // data may be needed to decode future frames (e.g. due to GIF/WebP
|
| + // frame compositing).
|
| virtual void clearFrameBufferCache(size_t) { }
|
|
|
| #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING)
|
|
|