Respect colorSpace in DecodingImageGenerator::onGetPixels()

third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.cpp

 /*
  * Copyright (C) 2012 Google Inc. 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 253 matching lines @@
   // JPEG images support YUV decoding; other decoders do not. (WebP could in the
   // future.)
   m_canYUVDecode = RuntimeEnabledFeatures::decodeToYUVEnabled() &&
                    (m_filenameExtension == "jpg");
   m_hasEmbeddedColorSpace = m_actualDecoder->hasEmbeddedColorSpace();
   m_colorSpaceForSkImages = m_actualDecoder->colorSpaceForSkImages();
 
   const bool isSingleFrame =
       m_actualDecoder->repetitionCount() == cAnimationNone ||
       (m_allDataReceived && m_actualDecoder->frameCount() == 1u);
-  const SkISize decodedSize =
-      SkISize::Make(m_actualDecoder->decodedSize().width(),
-                    m_actualDecoder->decodedSize().height());
+  const SkImageInfo info = SkImageInfo::Make(

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

nit: You could use MakeN32Premul (which has a flavor that takes a color space)
and drop the arguments for color and alpha type.

That said, it seems odd to me that the ImageFrameGenerator should have a full
SkImageInfo. IIUC, it can now create Frames that are premul or unpremul.

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

Acknowledged.

+      m_actualDecoder->decodedSize().width(),
+      m_actualDecoder->decodedSize().height(), kN32_SkColorType,
+      kPremul_SkAlphaType, m_colorSpaceForSkImages);
   m_frameGenerator = ImageFrameGenerator::create(
-      decodedSize, !isSingleFrame, m_actualDecoder->colorBehavior());
+      info, !isSingleFrame, m_actualDecoder->colorBehavior());
 }
 
 void DeferredImageDecoder::prepareLazyDecodedFrames() {
   if (!m_actualDecoder || !m_actualDecoder->isSizeAvailable())
     return;
 
   activateLazyDecoding();
 
   const size_t previousSize = m_frameData.size();
   m_frameData.resize(m_actualDecoder->frameCount());
@@ skipping 72 matching lines @@
 
 namespace WTF {
 template <>
 struct VectorTraits<blink::DeferredFrameData>
     : public SimpleClassVectorTraits<blink::DeferredFrameData> {
   STATIC_ONLY(VectorTraits);
   static const bool canInitializeWithMemset =
       false;  // Not all DeferredFrameData members initialize to 0.
 };
 }