Merge color options into ColorBehavior

third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoderTest.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 28 matching lines @@
 #include "wtf/Vector.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 
 const char layoutTestResourcesDir[] = "LayoutTests/images/resources";
 
 std::unique_ptr<ImageDecoder> createDecoder() {
-  return wrapUnique(new GIFImageDecoder(
-      ImageDecoder::AlphaNotPremultiplied, ImageDecoder::ColorSpaceTransformed,
-      ImageDecoder::targetColorSpaceForTesting(),
-      ImageDecoder::noDecodedImageByteLimit));
+  return wrapUnique(
+      new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied,
+                          ColorBehavior::transformToTargetForTesting(),
+                          ImageDecoder::noDecodedImageByteLimit));
 }
 
 void testRepetitionCount(const char* dir,
                          const char* file,
                          int expectedRepetitionCount) {
   std::unique_ptr<ImageDecoder> decoder = createDecoder();
   RefPtr<SharedBuffer> data = readFile(dir, file);
   ASSERT_TRUE(data.get());
   decoder->setData(data.get(), true);
   EXPECT_EQ(cAnimationLoopOnce,
@@ skipping 297 matching lines @@
   ASSERT_TRUE(fullData.get());
 
   // Empirically chosen truncation size:
   //   a) large enough to produce a partial frame &&
   //   b) small enough to not fully decode the frame
   const size_t kTruncateSize = 800;
   ASSERT_TRUE(kTruncateSize < fullData->size());
   RefPtr<SharedBuffer> partialData =
       SharedBuffer::create(fullData->data(), kTruncateSize);
 
-  std::unique_ptr<ImageDecoder> premulDecoder = wrapUnique(new GIFImageDecoder(
-      ImageDecoder::AlphaPremultiplied, ImageDecoder::ColorSpaceTransformed,
-      ImageDecoder::targetColorSpaceForTesting(),
-      ImageDecoder::noDecodedImageByteLimit));
-  std::unique_ptr<ImageDecoder> unpremulDecoder =
-      wrapUnique(new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied,
-                                     ImageDecoder::ColorSpaceTransformed,
-                                     ImageDecoder::targetColorSpaceForTesting(),
-                                     ImageDecoder::noDecodedImageByteLimit));
+  std::unique_ptr<ImageDecoder> premulDecoder = wrapUnique(
+      new GIFImageDecoder(ImageDecoder::AlphaPremultiplied,
+                          ColorBehavior::transformToTargetForTesting(),
+                          ImageDecoder::noDecodedImageByteLimit));
+  std::unique_ptr<ImageDecoder> unpremulDecoder = wrapUnique(
+      new GIFImageDecoder(ImageDecoder::AlphaNotPremultiplied,
+                          ColorBehavior::transformToTargetForTesting(),
+                          ImageDecoder::noDecodedImageByteLimit));
 
   // Partially decoded frame => the frame alpha type is unknown and should
   // reflect the requested format.
   premulDecoder->setData(partialData.get(), false);
   ASSERT_TRUE(premulDecoder->frameCount());
   unpremulDecoder->setData(partialData.get(), false);
   ASSERT_TRUE(unpremulDecoder->frameCount());
   ImageFrame* premulFrame = premulDecoder->frameBufferAtIndex(0);
   EXPECT_TRUE(premulFrame &&
               premulFrame->getStatus() != ImageFrame::FrameComplete);
@@ skipping 12 matching lines @@
   EXPECT_TRUE(premulFrame &&
               premulFrame->getStatus() == ImageFrame::FrameComplete);
   EXPECT_EQ(premulFrame->bitmap().alphaType(), kOpaque_SkAlphaType);
   unpremulFrame = unpremulDecoder->frameBufferAtIndex(0);
   EXPECT_TRUE(unpremulFrame &&
               unpremulFrame->getStatus() == ImageFrame::FrameComplete);
   EXPECT_EQ(unpremulFrame->bitmap().alphaType(), kOpaque_SkAlphaType);
 }
 
 }  // namespace blink