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

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 190 matching lines @@
     png_set_expand(png);
   }
 
   if (bitDepth == 16)
     png_set_strip_16(png);
 
   if (colorType == PNG_COLOR_TYPE_GRAY ||
       colorType == PNG_COLOR_TYPE_GRAY_ALPHA)
     png_set_gray_to_rgb(png);
 
-  if ((colorType & PNG_COLOR_MASK_COLOR) && !m_ignoreGammaAndColorProfile) {
+  if ((colorType & PNG_COLOR_MASK_COLOR) && !m_ignoreColorSpace) {
     // We only support color profiles for color PALETTE and RGB[A] PNG.
     // Supporting color profiles for gray-scale images is slightly tricky, at
     // least using the CoreGraphics ICC library, because we expand gray-scale
     // images to RGB but we do not similarly transform the color profile. We'd
     // either need to transform the color profile or we'd need to decode into a
     // gray-scale image buffer and hand that to CoreGraphics.
 #ifdef PNG_iCCP_SUPPORTED
     if (png_get_valid(png, info, PNG_INFO_sRGB)) {
-      setColorSpaceAndComputeTransform(nullptr, 0, true /* useSRGB */);
+      setColorSpaceAndComputeTransform(
+          SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named));
     } else {
       char* profileName = nullptr;
       int compressionType = 0;
 #if (PNG_LIBPNG_VER < 10500)
       png_charp profile = nullptr;
 #else
       png_bytep profile = nullptr;
 #endif
       png_uint_32 profileLength = 0;
       if (png_get_iCCP(png, info, &profileName, &compressionType, &profile,
                        &profileLength)) {
         setColorSpaceAndComputeTransform(reinterpret_cast<char*>(profile),
-                                         profileLength, false /* useSRGB */);
+                                         profileLength);
       }
     }
 #endif  // PNG_iCCP_SUPPORTED
   }
 
-  if (!hasColorProfile()) {
+  if (!hasColorSpace()) {
     // TODO (msarett):

[msarett, 2016/10/27 15:43:22]

I plan to follow up with this...

     // Applying the transfer function (gamma) should be handled by
     // SkColorSpaceXform.  Here we always convert to a transfer function that
     // is a 2.2 exponential.  This is a little strange given that the dst
     // transfer function is not necessarily a 2.2 exponential.
     // TODO (msarett):
     // Often, PNGs that specify their transfer function with the gAMA tag will
     // also specify their gamut with the cHRM tag.  We should read this tag
     // and do a full color space transformation if it is present.
     const double inverseGamma = 0.45455;
     const double defaultGamma = 2.2;
     double gamma;
-    if (!m_ignoreGammaAndColorProfile && png_get_gAMA(png, info, &gamma)) {
+    if (!m_ignoreColorSpace && png_get_gAMA(png, info, &gamma)) {
       const double maxGamma = 21474.83;
       if ((gamma <= 0.0) || (gamma > maxGamma)) {
         gamma = inverseGamma;
         png_set_gAMA(png, info, gamma);
       }
       png_set_gamma(png, defaultGamma, gamma);
     } else {
       png_set_gamma(png, defaultGamma, inverseGamma);
     }
   }
@@ skipping 26 matching lines @@
 void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer,
                                    unsigned rowIndex,
                                    int) {
   if (m_frameBufferCache.isEmpty())
     return;
 
   // Initialize the framebuffer if needed.
   ImageFrame& buffer = m_frameBufferCache[0];
   if (buffer.getStatus() == ImageFrame::FrameEmpty) {
     png_structp png = m_reader->pngPtr();
-    if (!buffer.setSizeAndColorProfile(size().width(), size().height(),
-                                       colorProfile())) {
+    if (!buffer.setSizeAndColorSpace(size().width(), size().height(),
+                                     colorSpace())) {
       longjmp(JMPBUF(png), 1);
       return;
     }
 
     unsigned colorChannels = m_reader->hasAlpha() ? 4 : 3;
     if (PNG_INTERLACE_ADAM7 ==
         png_get_interlace_type(png, m_reader->infoPtr())) {
       m_reader->createInterlaceBuffer(colorChannels * size().width() *
                                       size().height());
       if (!m_reader->interlaceBuffer()) {
@@ skipping 141 matching lines @@
   // has failed.
   if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
     setFailed();
 
   // If decoding is done or failed, we don't need the PNGImageReader anymore.
   if (isComplete(this) || failed())
     m_reader.reset();
 }
 
 }  // namespace blink