Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1485)

Unified Diff: Source/core/platform/image-decoders/gif/GIFImageDecoder.h

Issue 16260002: Reland "Decode GIF image frames on demand". (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/image-decoders/gif/GIFImageDecoder.h
diff --git a/Source/core/platform/image-decoders/gif/GIFImageDecoder.h b/Source/core/platform/image-decoders/gif/GIFImageDecoder.h
index b8634ba1e2b3d25c5afd62146117a0427322fc3d..769cde1bebc507f7713f9a3afaff164b875a3f2e 100644
--- a/Source/core/platform/image-decoders/gif/GIFImageDecoder.h
+++ b/Source/core/platform/image-decoders/gif/GIFImageDecoder.h
@@ -27,7 +27,7 @@
#define GIFImageDecoder_h
#include "core/platform/image-decoders/ImageDecoder.h"
-#include <wtf/OwnPtr.h>
+#include "wtf/OwnPtr.h"
class GIFImageReader;
@@ -39,39 +39,45 @@ namespace WebCore {
GIFImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);
virtual ~GIFImageDecoder();
- enum GIFQuery { GIFFullQuery, GIFSizeQuery, GIFFrameCountQuery };
+ enum GIFParseQuery { GIFSizeQuery, GIFFrameCountQuery };
// ImageDecoder
- virtual String filenameExtension() const { return "gif"; }
- virtual void setData(SharedBuffer* data, bool allDataReceived);
- virtual bool isSizeAvailable();
- virtual size_t frameCount();
- virtual int repetitionCount() const;
- virtual ImageFrame* frameBufferAtIndex(size_t);
- virtual bool frameIsCompleteAtIndex(size_t) const;
- virtual float frameDurationAtIndex(size_t) const;
+ virtual String filenameExtension() const OVERRIDE { return "gif"; }
+ virtual void setData(SharedBuffer* data, bool allDataReceived) OVERRIDE;
+ virtual bool isSizeAvailable() OVERRIDE;
+ virtual size_t frameCount() OVERRIDE;
+ virtual int repetitionCount() const OVERRIDE;
+ virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE;
+ virtual bool frameIsCompleteAtIndex(size_t) const OVERRIDE;
+ virtual float frameDurationAtIndex(size_t) const OVERRIDE;
// CAUTION: setFailed() deletes |m_reader|. Be careful to avoid
// accessing deleted memory, especially when calling this from inside
// GIFImageReader!
- virtual bool setFailed();
- virtual void clearFrameBufferCache(size_t clearBeforeFrame);
+ virtual bool setFailed() OVERRIDE;
// Callbacks from the GIF reader.
- bool haveDecodedRow(unsigned frameIndex, const Vector<unsigned char>& rowBuffer, size_t width, size_t rowNumber, unsigned repeatCount, bool writeTransparentPixels);
- bool frameComplete(unsigned frameIndex, unsigned frameDuration, ImageFrame::FrameDisposalMethod disposalMethod);
- void gifComplete();
+ bool haveDecodedRow(size_t frameIndex, const Vector<unsigned char>& rowBuffer, size_t width, size_t rowNumber, unsigned repeatCount, bool writeTransparentPixels);
+ bool frameComplete(size_t frameIndex);
+
+ // For testing.
+ bool parseCompleted() const;
private:
- // If the query is GIFFullQuery, decodes the image up to (but not
- // including) |haltAtFrame|. Otherwise, decodes as much as is needed to
- // answer the query, ignoring bitmap data. If decoding fails but there
- // is no more data coming, sets the "decode failure" flag.
- void decode(unsigned haltAtFrame, GIFQuery);
+ virtual void clearFrameBuffer(size_t frameIndex) OVERRIDE;
+
+ // Parses as much as is needed to answer the query, ignoring bitmap
+ // data. If parsing fails, sets the "decode failure" flag.
+ void parse(GIFParseQuery);
+
+ // Decodes bitmap data of the frame. Depending on the disposal method
+ // of prior frames, also decodes all required prior frames. If decoding
+ // fails, sets the "decode failure" flag.
+ void decode(size_t frameIndex);
// Called to initialize the frame buffer with the given index, based on
// the previous frame's disposal method. Returns true on success. On
// failure, this will mark the image as failed.
- bool initFrameBuffer(unsigned frameIndex);
+ bool initFrameBuffer(size_t frameIndex);
bool m_currentBufferSawAlpha;
mutable int m_repetitionCount;
« no previous file with comments | « Source/core/platform/image-decoders/ImageDecoderTest.cpp ('k') | Source/core/platform/image-decoders/gif/GIFImageDecoder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698