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

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 426 matching lines @@
         // set up for the scaled size after reading the image header using this
         // decoder, so using the full size is no longer possible.
         if (m_info.scale_num != m_info.scale_denom)
           overrideColorSpace = JCS_UNKNOWN;
         jpeg_calc_output_dimensions(&m_info);
         m_decoder->setDecodedSize(m_info.output_width, m_info.output_height);
 
         m_decoder->setOrientation(readImageOrientation(info()));
 
         // Allow color management of the decoded RGBA pixels if possible.
-        if (!m_decoder->ignoresGammaAndColorProfile()) {
+        if (!m_decoder->ignoresColorSpace()) {
           JOCTET* profile = nullptr;
           unsigned profileLength = 0;
           if (read_icc_profile(info(), &profile, &profileLength)) {
             decoder()->setColorSpaceAndComputeTransform(
-                reinterpret_cast<char*>(profile), profileLength,
-                false /* useSRGB */);
+                reinterpret_cast<char*>(profile), profileLength);
             free(profile);
           }
           if (decoder()->colorTransform()) {
             overrideColorSpace = JCS_UNKNOWN;
           }
         }
         if (overrideColorSpace == JCS_YCbCr) {
           m_info.out_color_space = JCS_YCbCr;
           m_info.raw_data_out = TRUE;
           m_uvSize = computeYUVSize(
@@ skipping 235 matching lines @@
       ->reader->fillBuffer();
 }
 
 void term_source(j_decompress_ptr jd) {
   reinterpret_cast_ptr<decoder_source_mgr*>(jd->src)
       ->reader->decoder()
       ->complete();
 }
 
 JPEGImageDecoder::JPEGImageDecoder(AlphaOption alphaOption,
-                                   GammaAndColorProfileOption colorOptions,
+                                   ColorSpaceOption colorOptions,
                                    size_t maxDecodedBytes)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes) {}
 
 JPEGImageDecoder::~JPEGImageDecoder() {}
 
 bool JPEGImageDecoder::setSize(unsigned width, unsigned height) {
   if (!ImageDecoder::setSize(width, height))
     return false;
 
   if (!desiredScaleNumerator())
@@ skipping 202 matching lines @@
   jpeg_decompress_struct* info = m_reader->info();
 
   // Initialize the framebuffer if needed.
   ImageFrame& buffer = m_frameBufferCache[0];
   if (buffer.getStatus() == ImageFrame::FrameEmpty) {
     ASSERT(info->output_width ==
            static_cast<JDIMENSION>(m_decodedSize.width()));
     ASSERT(info->output_height ==
            static_cast<JDIMENSION>(m_decodedSize.height()));
 
-    if (!buffer.setSizeAndColorProfile(info->output_width, info->output_height,
-                                       colorProfile()))
+    if (!buffer.setSizeAndColorSpace(info->output_width, info->output_height,
+                                     colorSpace()))
       return setFailed();
 
     // The buffer is transparent outside the decoded area while the image is
     // loading. The image will be marked fully opaque in complete().
     buffer.setStatus(ImageFrame::FramePartial);
     buffer.setHasAlpha(true);
 
     // For JPEGs, the frame always fills the entire image.
     buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
   }
@@ skipping 57 matching lines @@
   // has failed.
   if (!m_reader->decode(onlySize) && isAllDataReceived())
     setFailed();
 
   // If decoding is done or failed, we don't need the JPEGImageReader anymore.
   if (isComplete(this, onlySize) || failed())
     m_reader.reset();
 }
 
 }  // namespace blink