Add animation support for WebP images

Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 18 matching lines @@
 #ifndef WEBPImageDecoder_h
 #define WEBPImageDecoder_h
 
 #include "ImageDecoder.h"
 
 #if USE(WEBP)
 
 #include "webp/decode.h"
 #if USE(QCMSLIB) && (WEBP_DECODER_ABI_VERSION > 0x200)
 #define QCMS_WEBP_COLOR_CORRECTION
+#include "webp/demux.h"
 #endif
 
 namespace WebCore {
 
 class WEBPImageDecoder : public ImageDecoder {
 public:
     WEBPImageDecoder(ImageSource::AlphaOption, ImageSource::GammaAndColorProfileOption);
     virtual ~WEBPImageDecoder();
 
     virtual String filenameExtension() const { return "webp"; }
     virtual bool isSizeAvailable();
+    virtual size_t frameCount();
     virtual ImageFrame* frameBufferAtIndex(size_t index);
+#ifdef QCMS_WEBP_COLOR_CORRECTION
+    virtual void setData(SharedBuffer* data, bool allDataReceived);
+    virtual int repetitionCount() const { return m_repetitionCount; }
+    virtual void clearFrameBufferCache(size_t clearBeforeFrame);
+#endif
 
 private:
-    bool decode(bool onlySize);
+    bool decode(const uint8_t* dataBytes, size_t dataSize, bool onlySize, size_t frameIndex);
 
     WebPIDecoder* m_decoder;
-    bool m_hasAlpha;
     int m_formatFlags;
 
 #ifdef QCMS_WEBP_COLOR_CORRECTION
     qcms_transform* colorTransform() const { return m_transform; }
     void createColorTransform(const char* data, size_t);
-    void readColorProfile(const uint8_t* data, size_t);
-    void applyColorProfile(const uint8_t* data, size_t, ImageFrame&);
+    void readColorProfile();
+    // Recreates demux object when new data is available, and sets canvas size, format flags,
+    // animation properties etc as appropriate. Returns true on success. On
+    // failure, this will mark the image as failed.
+    bool updateDemuxer();
+    // Called to initialize the frame buffer at 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(const WebPIterator& fIter, size_t frameIndex);
+    // Apply color profile, and perform necessary post-processing for frame disposal.
+    void applyPostProcessing(size_t frameIndex);
+
+    // Number of rows decoded and post-processed so far in the current frame. It
+    // is used by applyPostProcessing() to decode and post-process incrementally.
+    int m_decodedHeight;
+
+    bool m_haveAlreadyParsedThisData;
+    WebPDemuxer* m_demux;
+    WebPDemuxState m_demuxState;
 
     bool m_haveReadProfile;
     qcms_transform* m_transform;
-    int m_decodedHeight;
+
+    bool m_haveReadAnimParams;
+    int m_repetitionCount;
 #else
-    void applyColorProfile(const uint8_t*, size_t, ImageFrame&) { };
+    void applyPostProcessing(size_t frameIndex) { };
 #endif
-    void clear();
+    void clearAll();
+    void clearDecoder();
 };
 
 } // namespace WebCore
 
 #endif
 
 #endif