Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / image-decoders / webp / WEBPImageDecoder.h

diff --git a/src/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.h b/src/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.h
index 778768b..0807059 100644 (file)
--- a/src/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.h
+++ b/src/third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.h
@@ -34,7 +34,7 @@
 #include "webp/decode.h"
 #include "webp/demux.h"
 
-namespace WebCore {
+namespace blink {
 
 class PLATFORM_EXPORT WEBPImageDecoder : public ImageDecoder {
 public:
@@ -43,6 +43,7 @@ public:
 
     virtual String filenameExtension() const OVERRIDE { return "webp"; }
     virtual bool isSizeAvailable() OVERRIDE;
+    virtual bool hasColorProfile() const OVERRIDE { return m_hasColorProfile; }
     virtual size_t frameCount() OVERRIDE;
     virtual ImageFrame* frameBufferAtIndex(size_t) OVERRIDE;
     virtual void setData(SharedBuffer* data, bool allDataReceived) OVERRIDE;
@@ -58,6 +59,7 @@ private:
     WebPDecBuffer m_decoderBuffer;
     int m_formatFlags;
     bool m_frameBackgroundHasAlpha;
+    bool m_hasColorProfile;
 
 #if USE(QCMSLIB)
     qcms_transform* colorTransform() const { return m_transform; }
@@ -80,10 +82,13 @@ private:
     int m_repetitionCount;
     int m_decodedHeight;
 
+    typedef void (*AlphaBlendFunction)(ImageFrame&, ImageFrame&, int, int, int);
+    AlphaBlendFunction m_blendFunction;
+
     void clear();
     void clearDecoder();
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif