Respect colorSpace in DecodingImageGenerator::onGetPixels()

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 208 matching lines @@
   // 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 setEmbeddedColorProfile(const char* iccData, unsigned iccLength);
   void setEmbeddedColorSpace(sk_sp<SkColorSpace> srcSpace);
 
   // Transformation from embedded color space to target color space.
   SkColorSpaceXform* colorTransform();
 
+  AlphaOption alphaOption() const {
+    return m_premultiplyAlpha ? AlphaPremultiplied : AlphaNotPremultiplied;

[scroggo_chromium, 2017/04/07 18:06:06]

I wonder if we should store an AlphaOption instead of a boolean. Seems a little
simpler (sometimes we end up converting the bool back to an AlphaOption; OTOH
sometimes we do want the bool...).

[msarett1, 2017/04/10 14:42:46]

I think it makes more sense to store the AlphaOption, but I don't want to make
that part of this CL.

[scroggo_chromium, 2017/04/10 17:31:23]

sgtm

+  }
+
   // 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;
   }
 
   bool failed() const { return m_failed; }
@@ skipping 184 matching lines @@
   bool m_hasHistogrammedColorSpace = false;
 
   sk_sp<SkColorSpace> m_embeddedColorSpace = nullptr;
   bool m_sourceToTargetColorTransformNeedsUpdate = false;
   std::unique_ptr<SkColorSpaceXform> m_sourceToTargetColorTransform;
 };
 
 }  // namespace blink
 
 #endif