Merge color options into ColorBehavior

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

Index: third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
index c158bad702952b8962008d79bc3a613ed910826d..29eefb7ce6fda231c01f26935684a23ac5c31bbf 100644
--- a/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
+++ b/third_party/WebKit/Source/platform/graphics/DecodingImageGenerator.cpp
@@ -142,8 +142,7 @@ SkImageGenerator* DecodingImageGenerator::create(SkData* data) {
   // don't really matter.
   std::unique_ptr<ImageDecoder> decoder = ImageDecoder::create(
       segmentReader, true, ImageDecoder::AlphaPremultiplied,
-      ImageDecoder::ColorSpaceTransformed,
-      ImageDecoder::globalTargetColorSpace());
+      ColorBehavior::transformToGlobalTarget());
   if (!decoder || !decoder->isSizeAvailable())
     return nullptr;
 
@@ -152,9 +151,9 @@ SkImageGenerator* DecodingImageGenerator::create(SkData* data) {
       SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType,
                            decoder->colorSpaceForSkImages());
 
-  RefPtr<ImageFrameGenerator> frame = ImageFrameGenerator::create(
-      SkISize::Make(size.width(), size.height()), false,
-      decoder->colorSpaceOption(), decoder->targetColorSpace());
+  RefPtr<ImageFrameGenerator> frame =
+      ImageFrameGenerator::create(SkISize::Make(size.width(), size.height()),
+                                  false, decoder->colorBehavior());
   if (!frame)
     return nullptr;