Merge color options into ColorBehavior

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007 Alp Toker <alp.toker@collabora.co.uk>
  * Copyright (C) 2008, 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.
@@ skipping 40 matching lines @@
   RefPtr<SharedBuffer> data = passData;
 
   if (m_decoder) {
     m_decoder->setData(data.release(), allDataReceived);
     // If the decoder is pre-instantiated, it means we've already validated the
     // data/signature at some point.
     return true;
   }
 
   if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
-    m_decoder = DeferredImageDecoder::create(
-        data, allDataReceived, ImageDecoder::AlphaPremultiplied,
-        ImageDecoder::ColorSpaceTagged, nullptr);
+    m_decoder = DeferredImageDecoder::create(data, allDataReceived,
+                                             ImageDecoder::AlphaPremultiplied,
+                                             ColorBehavior::tag());
   } else {
     m_decoder = DeferredImageDecoder::create(
         data, allDataReceived, ImageDecoder::AlphaPremultiplied,
-        ImageDecoder::ColorSpaceTransformed,
-        ImageDecoder::globalTargetColorSpace());
+        ColorBehavior::transformToGlobalTarget());
   }
 
   // Insufficient data is not a failure.
   return m_decoder || !ImageDecoder::hasSufficientDataToSniffImageType(*data);
 }
 
 String ImageSource::filenameExtension() const {
   return m_decoder ? m_decoder->filenameExtension() : String();
 }
 
@@ skipping 68 matching lines @@
 
 bool ImageSource::frameIsCompleteAtIndex(size_t index) const {
   return m_decoder && m_decoder->frameIsCompleteAtIndex(index);
 }
 
 size_t ImageSource::frameBytesAtIndex(size_t index) const {
   return m_decoder ? m_decoder->frameBytesAtIndex(index) : 0;
 }
 
 }  // namespace blink