Add animation support for WebP images

Source/core/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 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WEBPImageDecoder_h
 #define WEBPImageDecoder_h
 
 #include "core/platform/image-decoders/ImageDecoder.h"
 
 #include "webp/decode.h"
-#if USE(QCMSLIB) && (WEBP_DECODER_ABI_VERSION > 0x200)
+#if (WEBP_DECODER_ABI_VERSION > 0x200)
+#include "webp/demux.h"
+#define WEBP_ICC_ANIMATION_SUPPORT
+#if USE(QCMSLIB)
 #define QCMS_WEBP_COLOR_CORRECTION
 #endif
+#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 ImageFrame* frameBufferAtIndex(size_t);
+    virtual String filenameExtension() OVERRIDE const { return "webp"; }

[Noel Gordon, 2013/06/21 05:36:26]

s/OVERRIDE//

[urvang (Google), 2013/06/24 11:02:03]

Done.

P.S. It's weird, because both release and debug builds are ok on my linux box.
Also, GIF uses OVERRIDE for the same method, too.
Anyway, as long as it works.

[Xianzhu, 2013/06/24 16:20:25]

OVERRIDE is defined to nothing for g++ build. It'll be defined and checked for
clang build.

Why not using OVERRIDE here?

+    virtual bool isSizeAvailable() OVERRIDE;
+    virtual size_t frameCount() OVERRIDE;
+    virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE;
+#ifdef WEBP_ICC_ANIMATION_SUPPORT
+    virtual void setData(SharedBuffer* data, bool allDataReceived) OVERRIDE;
+    virtual int repetitionCount() const OVERRIDE;
+    virtual bool frameIsCompleteAtIndex(size_t) const OVERRIDE;
+    virtual float frameDurationAtIndex(size_t) const OVERRIDE;
+    virtual size_t clearCacheExceptFrame(size_t) OVERRIDE;
+#endif
 
 private:
-    bool decode(bool onlySize);
+    bool decode(const uint8_t* dataBytes, size_t dataSize, bool onlySize, size_t frameIndex);
 
     WebPIDecoder* m_decoder;
     WebPDecBuffer m_decoderBuffer;
-    bool m_hasAlpha;
     int m_formatFlags;
+    bool m_frameBackgroundHasAlpha;
 
 #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();
 
     bool m_haveReadProfile;
     qcms_transform* m_transform;
+#endif
+
+#ifdef WEBP_ICC_ANIMATION_SUPPORT
+    bool updateDemuxer();
+    bool initFrameBuffer(const WebPIterator&, size_t frameIndex);
+    void applyPostProcessing(size_t frameIndex);
+    virtual void clearFrameBuffer(size_t frameIndex) OVERRIDE;
+
+    WebPDemuxer* m_demux;
+    WebPDemuxState m_demuxState;
+    bool m_haveAlreadyParsedThisData;
+    bool m_haveReadAnimationParameters;
+    int m_repetitionCount;
     int m_decodedHeight;
 #else
-    void applyColorProfile(const uint8_t*, size_t, ImageFrame&) { };
+    void applyPostProcessing(size_t) { };
 #endif
+
     void clear();
+    void clearDecoder();
 };
 
 } // namespace WebCore
 
 #endif