Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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

Index: third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
index 3b5633bc4f95ca5f34000fb76f0135cd279dc716..57fbbb4e2497a1cc483740e5855b710c2b55c96c 100644
--- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
@@ -230,14 +230,14 @@ void PNGImageDecoder::headerAvailable() {
       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