| Index: Source/core/platform/image-decoders/gif/GIFImageReader.h
|
| diff --git a/Source/core/platform/image-decoders/gif/GIFImageReader.h b/Source/core/platform/image-decoders/gif/GIFImageReader.h
|
| index 105cd655e692776bf219a260e57dd2e1ef61d0fa..840b39b41110943626435869fa0b5b21fc36c830 100644
|
| --- a/Source/core/platform/image-decoders/gif/GIFImageReader.h
|
| +++ b/Source/core/platform/image-decoders/gif/GIFImageReader.h
|
| @@ -239,7 +239,6 @@ public:
|
| , m_globalColormapPosition(0)
|
| , m_globalColormapSize(0)
|
| , m_loopCount(cLoopCountNotSeen)
|
| - , m_currentDecodingFrame(0)
|
| , m_parseCompleted(false)
|
| {
|
| }
|
| @@ -249,8 +248,8 @@ public:
|
| }
|
|
|
| void setData(PassRefPtr<WebCore::SharedBuffer> data) { m_data = data; }
|
| - // FIXME: haltAtFrame should be size_t.
|
| - bool decode(WebCore::GIFImageDecoder::GIFQuery, unsigned haltAtFrame);
|
| + bool parse(WebCore::GIFImageDecoder::GIFParseQuery);
|
| + bool decode(size_t frameIndex);
|
|
|
| size_t imagesCount() const
|
| {
|
| @@ -290,7 +289,7 @@ public:
|
| bool parseCompleted() const { return m_parseCompleted; }
|
|
|
| private:
|
| - bool parse(size_t dataPosition, size_t len, bool parseSizeOnly);
|
| + bool parseData(size_t dataPosition, size_t len, WebCore::GIFImageDecoder::GIFParseQuery);
|
| void setRemainingBytes(size_t);
|
|
|
| const unsigned char* data(size_t dataPosition) const
|
| @@ -322,7 +321,6 @@ private:
|
| int m_loopCount; // Netscape specific extension block to control the number of animation loops a GIF renders.
|
|
|
| Vector<OwnPtr<GIFFrameContext> > m_frames;
|
| - size_t m_currentDecodingFrame;
|
|
|
| RefPtr<WebCore::SharedBuffer> m_data;
|
| bool m_parseCompleted;
|
|
|