Plumb color space to DecodingImageGenerator and ImageFrameGenerator

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 340 matching lines @@
   if (gTargetColorSpace)
     return;
 
   gTargetColorSpace =
       SkColorSpace::NewICC(profile.data(), profile.size()).release();
 
   // UMA statistics.
   BitmapImageMetrics::countGamma(gTargetColorSpace);
 }
 
-void ImageDecoder::setColorSpaceAndComputeTransform(const char* iccData,
-                                                    unsigned iccLength) {
-  setColorSpaceAndComputeTransform(SkColorSpace::NewICC(iccData, iccLength));
+sk_sp<SkColorSpace> ImageDecoder::colorSpace() const {
+  if (!RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
+    return nullptr;
+
+  if (m_embeddedColorSpace)
+    return m_embeddedColorSpace;
+  return SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+}
+
+void ImageDecoder::setColorProfileAndComputeTransform(const char* iccData,
+                                                      unsigned iccLength) {
+  sk_sp<SkColorSpace> colorSpace = SkColorSpace::NewICC(iccData, iccLength);

[Justin Novosad, 2016/10/31 14:55:13]

I feel that at this point the nullness of ColorSpace should be checked and if
necessary a warning should be logged, stating that an undecodable color profile
was encountered.

[ccameron, 2016/10/31 18:10:18]

Yes, definitely. Added. We should also consider some UMAs about what sorts of
ICCs we encounter in images -- this will be the place to add them cause all
decoders go through here.

+  setColorSpaceAndComputeTransform(colorSpace);
 }
 
 void ImageDecoder::setColorSpaceAndComputeTransform(
-    sk_sp<SkColorSpace> srcSpace) {
+    sk_sp<SkColorSpace> colorSpace) {
   DCHECK(!m_ignoreColorSpace);
 
-  m_srcSpace = srcSpace;
+  m_embeddedColorSpace = colorSpace;
+
   m_sourceToOutputDeviceColorTransform = nullptr;
 
   // With color correct rendering, we do not transform to the output color space
   // at decode time.  Instead, we tag the raw image pixels and pass the tagged
   // SkImage to Skia.
   if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled())
     return;
 
-  if (!m_srcSpace)
+  if (!m_embeddedColorSpace)
     return;
 
   // Take a lock around initializing and accessing the global device color
   // profile.
   SpinLock::Guard guard(gTargetColorSpaceLock);
 
   // Initialize the output device profile to sRGB if it has not yet been
   // initialized.
   if (!gTargetColorSpace) {
     gTargetColorSpace =
         SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named).release();
   }
 
-  if (SkColorSpace::Equals(srcSpace.get(), gTargetColorSpace)) {
+  if (SkColorSpace::Equals(m_embeddedColorSpace.get(), gTargetColorSpace)) {
     return;
   }
 
   m_sourceToOutputDeviceColorTransform =
-      SkColorSpaceXform::New(srcSpace.get(), gTargetColorSpace);
+      SkColorSpaceXform::New(m_embeddedColorSpace.get(), gTargetColorSpace);
 }
 
 }  // namespace blink