Merge color options into ColorBehavior

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

 /*
  * Copyright (C) 2009 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 27 matching lines @@
 #include "third_party/skia/include/core/SkImage.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/Vector.h"
 #include <algorithm>
 #include <memory>
 
 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();
 
   // Frames are arranged by decreasing size, then decreasing bit depth.
   // Pick the frame closest to |desiredSize|'s area without being smaller,
   // which has the highest bit depth.
   const size_t frameCount = decoder->frameCount();
   size_t index = 0;  // Default to first frame if none are large enough.
   int frameAreaAtIndex = 0;
   for (size_t i = 0; i < frameCount; ++i) {
@@ skipping 16 matching lines @@
   ImageFrame* frame = decoder->frameBufferAtIndex(index);
   return (frame && !decoder->failed()) ? WebImage(frame->bitmap()) : WebImage();
 }
 
 WebVector<WebImage> WebImage::framesFromData(const WebData& data) {
   // This is to protect from malicious images. It should be big enough that it's
   // never hit in practice.
   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>();
 
   // Frames are arranged by decreasing size, then decreasing bit depth.
   // Keep the first frame at every size, has the highest bit depth.
   const size_t frameCount = decoder->frameCount();
   IntSize lastSize;
 
   Vector<WebImage> frames;
   for (size_t i = 0; i < std::min(frameCount, maxFrameCount); ++i) {
@@ skipping 32 matching lines @@
 
 WebImage::WebImage(PassRefPtr<Image> image) {
   if (!image)
     return;
 
   if (sk_sp<SkImage> skImage = image->imageForCurrentFrame())
     skImage->asLegacyBitmap(&m_bitmap, SkImage::kRO_LegacyBitmapMode);
 }
 
 }  // namespace blink