Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c

1 files changed, 6 insertions, 0 deletions

diff --git a/WebCore/platform/image-decoders/ImageDecoder.h b/WebCore/platform/image-decoders/ImageDecoder.h
index 9fe0e6b..81d6dbb 100644
--- a/WebCore/platform/image-decoders/ImageDecoder.h
+++ b/WebCore/platform/image-decoders/ImageDecoder.h
@@ -47,6 +47,9 @@
 
 namespace WebCore {
 
+    // FIXME: Do we want better encapsulation?
+    typedef Vector<char> ColorProfile;
+
     // The RGBA32Buffer object represents the decoded image data in RGBA32
     // format.  This buffer is what all decoders write a single frame into.
     // Frames are then instantiated for drawing by being handed this buffer.
@@ -131,6 +134,7 @@ namespace WebCore {
         bool premultiplyAlpha() const { return m_premultiplyAlpha; }
 
         void setHasAlpha(bool alpha);
+        void setColorProfile(const ColorProfile&);
         void setRect(const IntRect& r) { m_rect = r; }
         void setStatus(FrameStatus status);
         void setDuration(unsigned duration) { m_duration = duration; }
@@ -202,6 +206,7 @@ namespace WebCore {
                         // same as ImageDecoder::m_size.
         bool m_hasAlpha; // Whether or not any of the pixels in the buffer
                          // have transparency.
+        ColorProfile m_colorProfile;
 #endif
         IntRect m_rect; // The rect of the original specified frame within
                         // the overall buffer.  This will always just be
@@ -354,6 +359,7 @@ namespace WebCore {
 
         RefPtr<SharedBuffer> m_data; // The encoded data.
         Vector<RGBA32Buffer> m_frameBufferCache;
+        ColorProfile m_colorProfile;
         bool m_scaled;
         Vector<int> m_scaledColumns;
         Vector<int> m_scaledRows;