Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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 72 matching lines @@
 std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::createForTesting(
     std::unique_ptr<ImageDecoder> actualDecoder) {
   return wrapUnique(new DeferredImageDecoder(std::move(actualDecoder)));
 }
 
 DeferredImageDecoder::DeferredImageDecoder(
     std::unique_ptr<ImageDecoder> actualDecoder)
     : m_allDataReceived(false),
       m_actualDecoder(std::move(actualDecoder)),
       m_repetitionCount(cAnimationNone),
-      m_hasColorSpace(false),
       m_canYUVDecode(false),
       m_hasHotSpot(false) {}
 
 DeferredImageDecoder::~DeferredImageDecoder() {}
 
 String DeferredImageDecoder::filenameExtension() const {
   return m_actualDecoder ? m_actualDecoder->filenameExtension()
                          : m_filenameExtension;
 }
 
@@ skipping 68 matching lines @@
     }
   }
 }
 
 bool DeferredImageDecoder::isSizeAvailable() {
   // m_actualDecoder is 0 only if image decoding is deferred and that means
   // the image header decoded successfully and the size is available.
   return m_actualDecoder ? m_actualDecoder->isSizeAvailable() : true;
 }
 
-bool DeferredImageDecoder::hasColorSpace() const {
-  return m_actualDecoder ? m_actualDecoder->hasColorSpace() : m_hasColorSpace;
+bool DeferredImageDecoder::hasEmbeddedColorSpace() const {
+  return m_actualDecoder ? m_actualDecoder->hasEmbeddedColorSpace()
+                         : m_hasEmbeddedColorSpace;
 }
 
 IntSize DeferredImageDecoder::size() const {
   return m_actualDecoder ? m_actualDecoder->size() : m_size;
 }
 
 IntSize DeferredImageDecoder::frameSizeAtIndex(size_t index) const {
   // FIXME: LocalFrame size is assumed to be uniform. This might not be true for
   // future supported codecs.
   return m_actualDecoder ? m_actualDecoder->frameSizeAtIndex(index) : m_size;
@@ skipping 65 matching lines @@
   if (m_frameGenerator)
     return;
 
   m_size = m_actualDecoder->size();
   m_hasHotSpot = m_actualDecoder->hotSpot(m_hotSpot);
   m_filenameExtension = m_actualDecoder->filenameExtension();
   // JPEG images support YUV decoding; other decoders do not. (WebP could in the
   // future.)
   m_canYUVDecode = RuntimeEnabledFeatures::decodeToYUVEnabled() &&
                    (m_filenameExtension == "jpg");
-  m_hasColorSpace = m_actualDecoder->hasColorSpace();
+  m_hasEmbeddedColorSpace = m_actualDecoder->hasEmbeddedColorSpace();
 
   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());
-  m_frameGenerator = ImageFrameGenerator::create(decodedSize, !isSingleFrame);
+  m_frameGenerator = ImageFrameGenerator::create(
+      decodedSize, m_actualDecoder->colorSpace(), !isSingleFrame);
 }
 
 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 16 matching lines @@
         m_actualDecoder->frameIsCompleteAtIndex(lastFrame);
   }
 
   if (m_allDataReceived) {
     m_repetitionCount = m_actualDecoder->repetitionCount();
     m_actualDecoder.reset();
     // Hold on to m_rwBuffer, which is still needed by createFrameAtIndex.
   }
 }
 
-inline SkImageInfo imageInfoFrom(const SkISize& decodedSize,
-                                 bool knownToBeOpaque) {
-  return SkImageInfo::MakeN32(
-      decodedSize.width(), decodedSize.height(),
-      knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
-}
-
 sk_sp<SkImage> DeferredImageDecoder::createFrameImageAtIndex(
     size_t index,
     bool knownToBeOpaque) {
   const SkISize& decodedSize = m_frameGenerator->getFullSize();
   ASSERT(decodedSize.width() > 0);
   ASSERT(decodedSize.height() > 0);
 
   sk_sp<SkROBuffer> roBuffer(m_rwBuffer->newRBufferSnapshot());
   RefPtr<SegmentReader> segmentReader =
       SegmentReader::createFromSkROBuffer(std::move(roBuffer));
+
+  SkImageInfo info = SkImageInfo::MakeN32(
+      decodedSize.width(), decodedSize.height(),
+      knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
+      m_frameGenerator->getColorSpace());
+
   DecodingImageGenerator* generator = new DecodingImageGenerator(
-      m_frameGenerator, imageInfoFrom(decodedSize, knownToBeOpaque),
-      segmentReader.release(), m_allDataReceived, index,
+      m_frameGenerator, info, segmentReader.release(), m_allDataReceived, index,
       m_frameData[index].m_uniqueID);
   sk_sp<SkImage> image = SkImage::MakeFromGenerator(
       generator);  // SkImage takes ownership of the generator.
   if (!image)
     return nullptr;
 
   // We can consider decoded bitmap constant and reuse uniqueID only after all
   // data is received.  We reuse it also for multiframe images when image data
   // is partially received but the frame data is fully received.
   if (m_allDataReceived || m_frameData[index].m_isComplete) {
@@ skipping 20 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.
 };
 }