Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h b/src/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
index 7c53706..28b2c3d 100644 (file)
--- a/src/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
+++ b/src/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
@@ -36,7 +36,6 @@
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/RefPtr.h"
-#include "wtf/Threading.h"
 #include "wtf/text/WTFString.h"
 #include "wtf/Vector.h"
 
@@ -149,11 +148,16 @@ public:
     // Number of bytes in the decoded frame requested. Return 0 if not yet decoded.
     virtual unsigned frameBytesAtIndex(size_t) const;
 
+    ImageOrientation orientation() const { return m_orientation; }
+
+    static bool deferredImageDecodingEnabled();
+
     void setIgnoreGammaAndColorProfile(bool flag) { m_ignoreGammaAndColorProfile = flag; }
     bool ignoresGammaAndColorProfile() const { return m_ignoreGammaAndColorProfile; }
 
-    ImageOrientation orientation() const { return m_orientation; }
+    virtual bool hasColorProfile() const { return false; }
 
+#if USE(QCMSLIB)
     enum { iccColorProfileHeaderLength = 128 };
 
     static bool rgbColorProfile(const char* profileData, unsigned profileLength)
@@ -170,7 +174,6 @@ public:
         return !memcmp(&profileData[12], "mntr", 4) || !memcmp(&profileData[12], "scnr", 4);
     }
 
-#if USE(QCMSLIB)
     class OutputDeviceProfile {
     public:
         OutputDeviceProfile()