Merge color options into ColorBehavior

third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

 /*
  * Copyright (c) 2013, 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 261 matching lines @@
 void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(
     WebTaskRunner* taskRunner,
     DOMArrayBuffer* arrayBuffer,
     const String& premultiplyAlphaOption,
     const String& colorSpaceConversionOption) {
   ASSERT(!isMainThread());
 
   ImageDecoder::AlphaOption alphaOp = ImageDecoder::AlphaPremultiplied;
   if (premultiplyAlphaOption == "none")
     alphaOp = ImageDecoder::AlphaNotPremultiplied;
-  ImageDecoder::ColorSpaceOption colorSpaceOp =
-      ImageDecoder::ColorSpaceTransformed;
+  bool ignoreColorSpace = false;
   if (colorSpaceConversionOption == "none")
-    colorSpaceOp = ImageDecoder::ColorSpaceIgnored;
+    ignoreColorSpace = true;
   std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
       SegmentReader::createFromSkData(SkData::MakeWithoutCopy(
           arrayBuffer->data(), arrayBuffer->byteLength())),
-      true, alphaOp, colorSpaceOp,
-      colorSpaceOp == ImageDecoder::ColorSpaceTransformed
-          ? ImageDecoder::globalTargetColorSpace()
-          : nullptr));
+      true, alphaOp,
+      ignoreColorSpace ? ColorBehavior::ignore()
+                       : ColorBehavior::transformToGlobalTarget()));
   sk_sp<SkImage> frame;
   if (decoder) {
     frame = ImageBitmap::getSkImageFromDecoder(std::move(decoder));
   }
   taskRunner->postTask(
       BLINK_FROM_HERE,
       crossThreadBind(&ImageBitmapFactories::ImageBitmapLoader::
                           resolvePromiseOnOriginalThread,
                       wrapCrossThreadPersistent(this), std::move(frame)));
 }
@@ skipping 17 matching lines @@
   }
   m_factory->didFinishLoading(this);
 }
 
 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader) {
   visitor->trace(m_factory);
   visitor->trace(m_resolver);
 }
 
 }  // namespace blink