Merge color options into ColorBehavior

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::ColorSpaceOption colorOptions,
-    sk_sp<SkColorSpace> targetColorSpace) {
+    const ColorBehavior& colorBehavior) {
   RefPtr<SharedBuffer> data = passData;
 
   std::unique_ptr<ImageDecoder> actualDecoder =
-      ImageDecoder::create(data, dataComplete, alphaOption, colorOptions,
-                           std::move(targetColorSpace));
+      ImageDecoder::create(data, dataComplete, alphaOption, colorBehavior);
   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);
 
@@ skipping 189 matching lines @@
   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());
   m_frameGenerator = ImageFrameGenerator::create(
-      decodedSize, !isSingleFrame, m_actualDecoder->colorSpaceOption(),
-      m_actualDecoder->targetColorSpace());
+      decodedSize, !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 74 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.
 };
 }