Refactor image decoders to use 'colorSpace' instead of 'colorProfile'

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 121 matching lines @@
     if (SkGetPackedA32(pixel) != 0xff) {
       blink::ImageFrame::PixelData prevPixel = *dst.getAddr(canvasX, canvasY);
       pixel = blendSrcOverDstNonPremultiplied(pixel, prevPixel);
     }
   }
 }
 
 namespace blink {
 
 WEBPImageDecoder::WEBPImageDecoder(AlphaOption alphaOption,
-                                   GammaAndColorProfileOption colorOptions,
+                                   ColorSpaceOption colorOptions,
                                    size_t maxDecodedBytes)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes),
       m_decoder(0),
       m_formatFlags(0),
       m_frameBackgroundHasAlpha(false),
       m_demux(0),
       m_demuxState(WEBP_DEMUX_PARSING_HEADER),
       m_haveAlreadyParsedThisData(false),
       m_repetitionCount(cAnimationLoopOnce),
       m_decodedHeight(0) {
@@ skipping 87 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 ((m_formatFlags & ICCP_FLAG) && !ignoresGammaAndColorProfile())
+    if ((m_formatFlags & ICCP_FLAG) && !ignoresColorSpace())
       readColorProfile();
   }
 
   ASSERT(isDecodedSizeAvailable());
 
   size_t frameCount = WebPDemuxGetI(m_demux, WEBP_FF_FRAME_COUNT);
   updateAggressivePurging(frameCount);
 
   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.setSizeAndColorProfile(size().width(), size().height(),
-                                       colorProfile()))
+    if (!buffer.setSizeAndColorSpace(size().width(), size().height(),
+                                     colorSpace()))
       return setFailed();
     m_frameBackgroundHasAlpha =
         !buffer.originalFrameRect().contains(IntRect(IntPoint(), size()));
   } else {
     ImageFrame& prevBuffer = m_frameBufferCache[requiredPreviousFrameIndex];
     ASSERT(prevBuffer.getStatus() == ImageFrame::FrameComplete);
 
     // Preserve the last frame as the starting state for this frame. We try
     // to reuse |prevBuffer| as starting state to avoid copying.
     // For BlendAtopPreviousFrame, both frames are required, so we can't
@@ skipping 53 matching lines @@
   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;
 
-  setColorSpaceAndComputeTransform(profileData, profileSize,
-                                   false /* useSRGB */);
+  setColorSpaceAndComputeTransform(profileData, profileSize);
 
   WebPDemuxReleaseChunkIterator(&chunkIterator);
 }
 
 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
@@ skipping 158 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.setSizeAndColorProfile(size().width(), size().height(),
-                                       colorProfile()))
+    if (!buffer.setSizeAndColorSpace(size().width(), size().height(),
+                                     colorSpace()))
       return setFailed();
     buffer.setStatus(ImageFrame::FramePartial);
     // The buffer is transparent outside the decoded area while the image is
     // loading. The correct alpha value for the frame will be set when it is
     // fully decoded.
     buffer.setHasAlpha(true);
     buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
   }
 
   const IntRect& frameRect = buffer.originalFrameRect();
@@ skipping 40 matching lines @@
         return false;
       }
     // FALLTHROUGH
     default:
       clear();
       return setFailed();
   }
 }
 
 }  // namespace blink