Create ImageDecoder target color space

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 189 matching lines @@
   virtual float frameDurationAtIndex(size_t) const { return 0; }
 
   // 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>&);
+
+  // Set the target color profile into which all images with embedded color
+  // profiles should be converted. Note that only the first call to this
+  // function in this process has any effect.
+  static void setGlobalTargetColorProfile(const WebVector<char>&);

[esprehn, 2016/11/21 20:19:30]

Since this isn't part of the public API we'd normally use a WTF::Vector instead.

[ccameron, 2016/11/21 22:28:14]

I changed the caller to just pass in its WebVector directly -- does that look
better?

+  static sk_sp<SkColorSpace> globalTargetColorSpace();
 
   // 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);
+  void setEmbeddedColorProfile(const char* iccData, unsigned iccLength);
+  void setEmbeddedColorSpace(sk_sp<SkColorSpace> srcSpace);
 
-  // Transformation from encoded color space to target color space.
-  SkColorSpaceXform* colorTransform() {
-    return m_sourceToOutputDeviceColorTransform.get();
-  }
+  // Transformation from embedded color space to target color space.
+  SkColorSpaceXform* colorTransform();
 
   // 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
   // clean up any local data.
   virtual bool setFailed() {
     m_failed = true;
     return false;
   }
 
@@ skipping 116 matching lines @@
   }
 
   bool m_purgeAggressively;
 
   IntSize m_size;
   bool m_sizeAvailable = false;
   bool m_isAllDataReceived = false;
   bool m_failed = false;
   bool m_hasHistogrammedColorSpace = false;
 
+  sk_sp<SkColorSpace> m_targetColorSpace = nullptr;
   sk_sp<SkColorSpace> m_embeddedColorSpace = nullptr;
-  std::unique_ptr<SkColorSpaceXform> m_sourceToOutputDeviceColorTransform;
+  bool m_sourceToTargetColorTransformNeedsUpdate = false;
+  std::unique_ptr<SkColorSpaceXform> m_sourceToTargetColorTransform;
 };
 
 }  // namespace blink
 
 #endif