Merge color options into ColorBehavior

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

Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
index f053a33e37d4afb757810137089f54b41c110043..0e3afe2aae2e4ea0c4730edfdaa232d5cf3a63d5 100644
--- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
+++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp
@@ -279,17 +279,15 @@ void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(
   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));