Refactor image decoders to use 'colorSpace' instead of 'colorProfile'

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 43 matching lines @@
   float m_duration;
   bool m_isComplete;
   size_t m_frameBytes;
   uint32_t m_uniqueID;
 };
 
 std::unique_ptr<DeferredImageDecoder> DeferredImageDecoder::create(
     PassRefPtr<SharedBuffer> passData,
     bool dataComplete,
     ImageDecoder::AlphaOption alphaOption,
-    ImageDecoder::GammaAndColorProfileOption colorOptions) {
+    ImageDecoder::ColorSpaceOption colorOptions) {
   RefPtr<SharedBuffer> data = passData;
 
   std::unique_ptr<ImageDecoder> actualDecoder =
       ImageDecoder::create(data, dataComplete, alphaOption, colorOptions);
 
   if (!actualDecoder)
     return nullptr;
 
   std::unique_ptr<DeferredImageDecoder> decoder(
       new DeferredImageDecoder(std::move(actualDecoder)));
 
   // Since we've just instantiated a fresh decoder, there's no need to reset its
   // data.
   decoder->setDataInternal(data.release(), dataComplete, false);
 
   return decoder;
 }
 
 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_hasColorProfile(false),
+      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::hasColorProfile() const {
-  return m_actualDecoder ? m_actualDecoder->hasColorProfile()
-                         : m_hasColorProfile;
+bool DeferredImageDecoder::hasColorSpace() const {
+  return m_actualDecoder ? m_actualDecoder->hasColorSpace() : m_hasColorSpace;
 }
 
 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_hasColorProfile = m_actualDecoder->hasColorProfile();
+  m_hasColorSpace = m_actualDecoder->hasColorSpace();
 
   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);
 }
 
@@ skipping 84 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.
 };
 }