Merge color options into ColorBehavior

third_party/WebKit/Source/platform/exported/WebImage.cpp

Index: third_party/WebKit/Source/platform/exported/WebImage.cpp
diff --git a/third_party/WebKit/Source/platform/exported/WebImage.cpp b/third_party/WebKit/Source/platform/exported/WebImage.cpp
index 755c959d538a899fb00e99e94f01772a65194dc2..86c6835b3f5df84e16db0f3bfb6ad0a73c335ff4 100644
--- a/third_party/WebKit/Source/platform/exported/WebImage.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebImage.cpp
@@ -45,9 +45,8 @@ namespace blink {
 
 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize) {
   RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
-  std::unique_ptr<ImageDecoder> decoder(
-      ImageDecoder::create(buffer, true, ImageDecoder::AlphaPremultiplied,
-                           ImageDecoder::ColorSpaceIgnored, nullptr));
+  std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
+      buffer, true, ImageDecoder::AlphaPremultiplied, ColorBehavior::ignore()));
   if (!decoder || !decoder->isSizeAvailable())
     return WebImage();
 
@@ -84,9 +83,8 @@ WebVector<WebImage> WebImage::framesFromData(const WebData& data) {
   const size_t maxFrameCount = 8;
 
   RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
-  std::unique_ptr<ImageDecoder> decoder(
-      ImageDecoder::create(buffer, true, ImageDecoder::AlphaPremultiplied,
-                           ImageDecoder::ColorSpaceIgnored, nullptr));
+  std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
+      buffer, true, ImageDecoder::AlphaPremultiplied, ColorBehavior::ignore()));
   if (!decoder || !decoder->isSizeAvailable())
     return WebVector<WebImage>();