Color: Read embedded ICC profiles regardless of QCMS

third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

 /*
  * 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 213 matching lines @@
             // an ANIM chunk must precede the ANMF frame chunks.
             m_repetitionCount = WebPDemuxGetI(m_demux, WEBP_FF_LOOP_COUNT);
             // Repetition count is always <= 16 bits.
             ASSERT(m_repetitionCount == (m_repetitionCount & 0xffff));
             if (!m_repetitionCount)
                 m_repetitionCount = cAnimationLoopInfinite;
             // FIXME: Implement ICC profile support for animated images.
             m_formatFlags &= ~ICCP_FLAG;
         }
 
-#if USE(QCMSLIB)
         if ((m_formatFlags & ICCP_FLAG) && !ignoresGammaAndColorProfile())
             readColorProfile();
-#endif
     }
 
     ASSERT(isDecodedSizeAvailable());
     return true;
 }
 
 bool WEBPImageDecoder::initFrameBuffer(size_t frameIndex)
 {
     ImageFrame& buffer = m_frameBufferCache[frameIndex];
     if (buffer.getStatus() != ImageFrame::FrameEmpty) // Already initialized.
         return true;
 
     const size_t requiredPreviousFrameIndex = buffer.requiredPreviousFrameIndex();
     if (requiredPreviousFrameIndex == kNotFound) {
         // This frame doesn't rely on any previous data.
-        if (!buffer.setSize(size().width(), size().height()))
+        if (!buffer.setSizeAndColorProfile(size().width(), size().height(), colorProfile()))
             return setFailed();
         m_frameBackgroundHasAlpha = !buffer.originalFrameRect().contains(IntRect(IntPoint(), size()));
     } else {
         const ImageFrame& prevBuffer = m_frameBufferCache[requiredPreviousFrameIndex];
         ASSERT(prevBuffer.getStatus() == ImageFrame::FrameComplete);
 
         // Preserve the last frame as the starting state for this frame.
         if (!buffer.copyBitmapData(prevBuffer))
             return setFailed();
 
@@ skipping 29 matching lines @@
 
 void WEBPImageDecoder::clearFrameBuffer(size_t frameIndex)
 {
     if (m_demux && m_demuxState >= WEBP_DEMUX_PARSED_HEADER && m_frameBufferCache[frameIndex].getStatus() == ImageFrame::FramePartial) {
         // Clear the decoder state so that this partial frame can be decoded again when requested.
         clearDecoder();
     }
     ImageDecoder::clearFrameBuffer(frameIndex);
 }
 
-#if USE(QCMSLIB)
-
 void WEBPImageDecoder::readColorProfile()
 {
     WebPChunkIterator chunkIterator;
     if (!WebPDemuxGetChunk(m_demux, "ICCP", 1, &chunkIterator)) {
         WebPDemuxReleaseChunkIterator(&chunkIterator);
         return;
     }
 
     const char* profileData = reinterpret_cast<const char*>(chunkIterator.chunk.bytes);
     size_t profileSize = chunkIterator.chunk.size;
 
-    setColorProfileAndTransform(profileData, profileSize, true /* hasAlpha */, false /* useSRGB */);
+    setColorProfileAndComputeTransform(profileData, profileSize, true /* hasAlpha */, false /* useSRGB */);
 
     WebPDemuxReleaseChunkIterator(&chunkIterator);
 }
 
-#endif // USE(QCMSLIB)
-
 void WEBPImageDecoder::applyPostProcessing(size_t frameIndex)
 {
     ImageFrame& buffer = m_frameBufferCache[frameIndex];
     int width;
     int decodedHeight;
     if (!WebPIDecGetRGB(m_decoder, &decodedHeight, &width, 0, 0))
         return; // See also https://bugs.webkit.org/show_bug.cgi?id=74062
     if (decodedHeight <= 0)
         return;
 
@@ skipping 122 matching lines @@
     if (failed())
         return false;
 
     ASSERT(isDecodedSizeAvailable());
 
     ASSERT(m_frameBufferCache.size() > frameIndex);
     ImageFrame& buffer = m_frameBufferCache[frameIndex];
     ASSERT(buffer.getStatus() != ImageFrame::FrameComplete);
 
     if (buffer.getStatus() == ImageFrame::FrameEmpty) {
-        if (!buffer.setSize(size().width(), size().height()))
+        if (!buffer.setSizeAndColorProfile(size().width(), size().height(), colorProfile()))
             return setFailed();
         buffer.setStatus(ImageFrame::FramePartial);
         // The buffer is transparent outside the decoded area while the image is loading.
         // The correct value of 'hasAlpha' for the frame will be set when it is fully decoded.
         buffer.setHasAlpha(true);
         buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
     }
 
     const IntRect& frameRect = buffer.originalFrameRect();
     if (!m_decoder) {
@@ skipping 29 matching lines @@
             return false;
         }
         // FALLTHROUGH
     default:
         clear();
         return setFailed();
     }
 }
 
 } // namespace blink