Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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 212 matching lines @@
       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);
+        setColorProfileAndComputeTransform(reinterpret_cast<char*>(profile),
+                                           profileLength);
       }
     }
 #endif  // PNG_iCCP_SUPPORTED
   }
 
-  if (!hasColorSpace()) {
+  if (!hasEmbeddedColorSpace()) {
     // TODO (msarett):
     // 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;
@@ skipping 202 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