Merge color options into ColorBehavior

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 692 matching lines @@
       ->reader->fillBuffer();
 }
 
 void term_source(j_decompress_ptr jd) {
   reinterpret_cast_ptr<decoder_source_mgr*>(jd->src)
       ->reader->decoder()
       ->complete();
 }
 
 JPEGImageDecoder::JPEGImageDecoder(AlphaOption alphaOption,
-                                   ColorSpaceOption colorOptions,
-                                   sk_sp<SkColorSpace> targetColorSpace,
+                                   const ColorBehavior& colorBehavior,
                                    size_t maxDecodedBytes)
-    : ImageDecoder(alphaOption,
-                   colorOptions,
-                   std::move(targetColorSpace),
-                   maxDecodedBytes) {}
+    : ImageDecoder(alphaOption, colorBehavior, maxDecodedBytes) {}
 
 JPEGImageDecoder::~JPEGImageDecoder() {}
 
 bool JPEGImageDecoder::setSize(unsigned width, unsigned height) {
   if (!ImageDecoder::setSize(width, height))
     return false;
 
   if (!desiredScaleNumerator())
     return setFailed();
 
@@ skipping 279 matching lines @@
   // has failed.
   if (!m_reader->decode(onlySize) && isAllDataReceived())
     setFailed();
 
   // If decoding is done or failed, we don't need the JPEGImageReader anymore.
   if (isComplete(this, onlySize) || failed())
     m_reader.reset();
 }
 
 }  // namespace blink