Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 191 matching lines @@
   // Number of bytes in the decoded frame. Returns 0 if the decoder doesn't
   // have this frame cached (either because it hasn't been decoded, or because
   // it has been cleared).
   virtual size_t frameBytesAtIndex(size_t) const;
 
   ImageOrientation orientation() const { return m_orientation; }
 
   bool ignoresColorSpace() const { return m_ignoreColorSpace; }
   static void setTargetColorProfile(const WebVector<char>&);
 
-  // Note that hasColorSpace refers to the existence of a not-ignored
-  // embedded color space, and is independent of whether or not that
-  // space's transform has been baked into the pixel values.
-  bool hasColorSpace() const { return m_srcSpace.get(); }
-  void setColorSpaceAndComputeTransform(const char* iccData,
-                                        unsigned iccLength);
+  // This returns the color space of this image. If the image had no embedded
+  // color profile, this will return sRGB. Returns nullptr if color correct
+  // rendering is not enabled.
+  sk_sp<SkColorSpace> colorSpace() const;
+
+  // This returns whether or not the image included a not-ignored embedded
+  // color space. This is independent of whether or not that space's transform
+  // has been baked into the pixel values.
+  bool hasEmbeddedColorSpace() const { return m_embeddedColorSpace.get(); }
+
+  // Set the embedded color space directly or via ICC profile.
+  void setColorProfileAndComputeTransform(const char* iccData,
+                                          unsigned iccLength);
   void setColorSpaceAndComputeTransform(sk_sp<SkColorSpace> srcSpace);
 
   // Transformation from encoded color space to target color space.
   SkColorSpaceXform* colorTransform() {
     return m_sourceToOutputDeviceColorTransform.get();
   }
 
   // Sets the "decode failure" flag.  For caller convenience (since so
   // many callers want to return false after calling this), returns false
   // to enable easy tailcalling.  Subclasses may override this to also
@@ skipping 66 matching lines @@
   // returns that number.
   virtual size_t decodeFrameCount() { return 1; }
 
   // Performs any additional setup of the requested frame after it has been
   // initially created, e.g. setting a duration or disposal method.
   virtual void initializeNewFrame(size_t) {}
 
   // Decodes the requested frame.
   virtual void decode(size_t) = 0;
 
-  // Returns the embedded image color space.
-  sk_sp<SkColorSpace> colorSpace() const { return m_srcSpace; }
-
   RefPtr<SegmentReader> m_data;  // The encoded data.
   Vector<ImageFrame, 1> m_frameBufferCache;
   const bool m_premultiplyAlpha;
   const bool m_ignoreColorSpace;
   ImageOrientation m_orientation;
 
   // The maximum amount of memory a decoded image should require. Ideally,
   // image decoders should downsample large images to fit under this limit
   // (and then return the downsampled size from decodedSize()). Ignoring
   // this limit can cause excessive memory use or even crashes on low-
@@ skipping 18 matching lines @@
     unsigned long long total_size = static_cast<unsigned long long>(width) *
                                     static_cast<unsigned long long>(height);
     return total_size > ((1 << 29) - 1);
   }
 
   IntSize m_size;
   bool m_sizeAvailable = false;
   bool m_isAllDataReceived = false;
   bool m_failed = false;
 
-  sk_sp<SkColorSpace> m_srcSpace = nullptr;
+  sk_sp<SkColorSpace> m_embeddedColorSpace = nullptr;
   std::unique_ptr<SkColorSpaceXform> m_sourceToOutputDeviceColorTransform;
 };
 
 }  // namespace blink
 
 #endif