Color: Read embedded ICC profiles regardless of QCMS

third_party/WebKit/Source/platform/image-decoders/ImageFrame.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 ImageFrame_h
 #define ImageFrame_h
 
 #include "platform/PlatformExport.h"
 #include "platform/geometry/IntRect.h"
+#include "public/platform/WebVector.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "wtf/Allocator.h"
 #include "wtf/Assertions.h"
 #include "wtf/PassRefPtr.h"
 
 namespace blink {
 
 // ImageFrame represents the decoded image data.  This buffer is what all
 // decoders write a single frame into.
 class PLATFORM_EXPORT ImageFrame final {
@@ skipping 21 matching lines @@
         // initial buffer state (i.e. any previous frame buffer after having
         // been properly disposed).
         BlendAtopPreviousFrame,
 
         // Blend non-opaque pixels against fully transparent (i.e. simply
         // overwrite the corresponding pixels).
         BlendAtopBgcolor,
     };
     typedef uint32_t PixelData;
 
+    typedef WebVector<char> ICCProfile;
+
     ImageFrame();
 
     // The assignment operator reads m_hasAlpha (inside setStatus()) before it
     // sets it (in setHasAlpha()).  This doesn't cause any problems, since the
     // setHasAlpha() call ensures all state is set correctly, but it means we
     // need to initialize m_hasAlpha to some value before calling the operator
     // lest any tools complain about using an uninitialized value.
     ImageFrame(const ImageFrame& other) : m_hasAlpha(false) { operator=(other); }
 
     // For backends which refcount their data, this operator doesn't need to
@@ skipping 21 matching lines @@
         ASSERT(endY <= height());
         const int rowBytes = (endX - startX) * sizeof(PixelData);
         const PixelData* const startAddr = getAddr(startX, startY);
         for (int destY = startY + 1; destY < endY; ++destY)
             memcpy(getAddr(startX, destY), startAddr, rowBytes);
     }
 
     // Allocates space for the pixel data.  Must be called before any pixels
     // are written.  Must only be called once.  Returns whether allocation
     // succeeded.
-    bool setSize(int newWidth, int newHeight);
+    bool setSizeAndColorProfile(int newWidth, int newHeight, const ICCProfile& newIccProfile);
 
     bool hasAlpha() const;
     const IntRect& originalFrameRect() const { return m_originalFrameRect; }
     Status getStatus() const { return m_status; }
     unsigned duration() const { return m_duration; }
     DisposalMethod getDisposalMethod() const { return m_disposalMethod; }
     AlphaBlendSource getAlphaBlendSource() const { return m_alphaBlendSource; }
     bool premultiplyAlpha() const { return m_premultiplyAlpha; }
     SkBitmap::Allocator* allocator() const { return m_allocator; }
     const SkBitmap& bitmap() const { return m_bitmap; }
@@ skipping 88 matching lines @@
     // The frame that must be decoded before this frame can be decoded.
     // WTF::kNotFound if this frame doesn't require any previous frame.
     // This is used by ImageDecoder::clearCacheExceptFrame(), and will never
     // be read for image formats that do not have multiple frames.
     size_t m_requiredPreviousFrameIndex;
 };
 
 } // namespace blink
 
 #endif