Remove ColorBehavior argument to Image::imageForCurrentFrame

third_party/WebKit/Source/core/frame/ImageBitmapTest.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 109 matching lines @@
       imageElement, cropRect, &(imageElement->document()), defaultOptions);
   cropRect = IntRect(-m_image->width() / 2, -m_image->height() / 2,
                      m_image->width(), m_image->height());
   ImageBitmap* imageBitmapExteriorCrop = ImageBitmap::create(
       imageElement, cropRect, &(imageElement->document()), defaultOptions);
   cropRect = IntRect(-m_image->width(), -m_image->height(), m_image->width(),
                      m_image->height());
   ImageBitmap* imageBitmapOutsideCrop = ImageBitmap::create(
       imageElement, cropRect, &(imageElement->document()), defaultOptions);
 
-  ASSERT_NE(imageBitmapNoCrop->bitmapImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()),
-            imageElement->cachedImage()->getImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()));
-  ASSERT_NE(imageBitmapInteriorCrop->bitmapImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()),
-            imageElement->cachedImage()->getImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()));
-  ASSERT_NE(imageBitmapExteriorCrop->bitmapImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()),
-            imageElement->cachedImage()->getImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()));
+  ASSERT_NE(imageBitmapNoCrop->bitmapImage()->imageForCurrentFrame(),
+            imageElement->cachedImage()->getImage()->imageForCurrentFrame());
+  ASSERT_NE(imageBitmapInteriorCrop->bitmapImage()->imageForCurrentFrame(),
+            imageElement->cachedImage()->getImage()->imageForCurrentFrame());
+  ASSERT_NE(imageBitmapExteriorCrop->bitmapImage()->imageForCurrentFrame(),
+            imageElement->cachedImage()->getImage()->imageForCurrentFrame());
 
   StaticBitmapImage* emptyImage = imageBitmapOutsideCrop->bitmapImage();
-  ASSERT_NE(emptyImage->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()),
-            imageElement->cachedImage()->getImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()));
+  ASSERT_NE(emptyImage->imageForCurrentFrame(),
+            imageElement->cachedImage()->getImage()->imageForCurrentFrame());
 }
 
 // Verifies that ImageBitmaps constructed from HTMLImageElements hold a
 // reference to the original Image if the HTMLImageElement src is changed.
 TEST_F(ImageBitmapTest, ImageBitmapSourceChanged) {
   HTMLImageElement* image = HTMLImageElement::create(*Document::create());
   ImageResourceContent* originalImageResource =
       ImageResourceContent::create(StaticBitmapImage::create(m_image).get());
   image->setImageResource(originalImageResource);
 
   const ImageBitmapOptions defaultOptions;
   Optional<IntRect> cropRect =
       IntRect(0, 0, m_image->width(), m_image->height());
   ImageBitmap* imageBitmap = ImageBitmap::create(
       image, cropRect, &(image->document()), defaultOptions);
   // As we are applying color space conversion for the "default" mode,
   // this verifies that the color corrected image is not the same as the
   // source.
-  ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()),
-            originalImageResource->getImage()->imageForCurrentFrame(
-                ColorBehavior::transformToTargetForTesting()));
+  ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(),
+            originalImageResource->getImage()->imageForCurrentFrame());
 
   ImageResourceContent* newImageResource =
       ImageResourceContent::create(StaticBitmapImage::create(m_image2).get());
   image->setImageResource(newImageResource);
 
   {
-    ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(
-                  ColorBehavior::transformToTargetForTesting()),
-              originalImageResource->getImage()->imageForCurrentFrame(
-                  ColorBehavior::transformToTargetForTesting()));
-    SkImage* image1 =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::transformToTargetForTesting())
-            .get();
+    ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(),
+              originalImageResource->getImage()->imageForCurrentFrame());
+    SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get();
     ASSERT_NE(image1, nullptr);
     SkImage* image2 =
-        originalImageResource->getImage()
-            ->imageForCurrentFrame(ColorBehavior::transformToTargetForTesting())
-            .get();
+        originalImageResource->getImage()->imageForCurrentFrame().get();
     ASSERT_NE(image2, nullptr);
     ASSERT_NE(image1, image2);
   }
 
   {
-    ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(
-                  ColorBehavior::transformToTargetForTesting()),
-              newImageResource->getImage()->imageForCurrentFrame(
-                  ColorBehavior::transformToTargetForTesting()));
-    SkImage* image1 =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::transformToTargetForTesting())
-            .get();
+    ASSERT_NE(imageBitmap->bitmapImage()->imageForCurrentFrame(),
+              newImageResource->getImage()->imageForCurrentFrame());
+    SkImage* image1 = imageBitmap->bitmapImage()->imageForCurrentFrame().get();
     ASSERT_NE(image1, nullptr);
     SkImage* image2 =
-        newImageResource->getImage()
-            ->imageForCurrentFrame(ColorBehavior::transformToTargetForTesting())
-            .get();
+        newImageResource->getImage()->imageForCurrentFrame().get();
     ASSERT_NE(image2, nullptr);
     ASSERT_NE(image1, image2);
   }
 }
 
 enum class ColorSpaceConversion : uint8_t {
   NONE = 0,
   DEFAULT_NOT_COLOR_CORRECTED = 1,
   DEFAULT_COLOR_CORRECTED = 2,
   SRGB = 3,
@@ skipping 62 matching lines @@
   for (uint8_t i = static_cast<uint8_t>(
            ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
        i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) {
     ColorSpaceConversion colorSpaceConversion =
         static_cast<ColorSpaceConversion>(i);
     ImageBitmapOptions options =
         prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion);
     ImageBitmap* imageBitmap = ImageBitmap::create(
         imageElement, cropRect, &(imageElement->document()), options);
 
-    // ColorBehavior::ignore() is used instead of
-    // ColorBehavior::transformToTargetForTesting() to avoid color conversion to
-    // display color profile, as we want to solely rely on the color correction
-    // that happens in ImageBitmap create method.
     SkImage* convertedImage =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::ignore())
-            .get();
+        imageBitmap->bitmapImage()->imageForCurrentFrame().get();
 
     switch (colorSpaceConversion) {
       case ColorSpaceConversion::NONE:
         NOTREACHED();
         break;
       case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
         colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
@@ skipping 71 matching lines @@
   SkColorSpaceXform::ColorFormat colorFormat = colorFormat32;
 
   for (uint8_t i = static_cast<uint8_t>(
            ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
        i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) {
     ColorSpaceConversion colorSpaceConversion =
         static_cast<ColorSpaceConversion>(i);
     options = prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion);
     ImageBitmap* imageBitmap =
         ImageBitmap::create(sourceImageBitmap, cropRect, options);
-    // ColorBehavior::ignore() is used instead of
-    // ColorBehavior::transformToTargetForTesting() to avoid color conversion to
-    // display color profile, as we want to solely rely on the color correction
-    // that happens in ImageBitmap create method.
     SkImage* convertedImage =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::ignore())
-            .get();
+        imageBitmap->bitmapImage()->imageForCurrentFrame().get();
 
     switch (colorSpaceConversion) {
       case ColorSpaceConversion::NONE:
         NOTREACHED();
         break;
       case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
         colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
@@ skipping 62 matching lines @@
   for (uint8_t i = static_cast<uint8_t>(
            ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED);
        i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) {
     ColorSpaceConversion colorSpaceConversion =
         static_cast<ColorSpaceConversion>(i);
     ImageBitmapOptions options =
         prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion);
     ImageBitmap* imageBitmap = ImageBitmap::create(
         StaticBitmapImage::create(image), cropRect, options);
 
-    // ColorBehavior::ignore() is used instead of
-    // ColorBehavior::transformToTargetForTesting() to avoid color conversion to
-    // display color profile, as we want to solely rely on the color correction
-    // that happens in ImageBitmap create method.
     SkImage* convertedImage =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::ignore())
-            .get();
+        imageBitmap->bitmapImage()->imageForCurrentFrame().get();
 
     switch (colorSpaceConversion) {
       case ColorSpaceConversion::NONE:
         NOTREACHED();
         break;
       case ColorSpaceConversion::DEFAULT_NOT_COLOR_CORRECTED:
         colorSpace = ColorBehavior::globalTargetColorSpace().ToSkColorSpace();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
@@ skipping 53 matching lines @@
   for (uint8_t i =
            static_cast<uint8_t>(ColorSpaceConversion::DEFAULT_COLOR_CORRECTED);
        i <= static_cast<uint8_t>(ColorSpaceConversion::LAST); i++) {
     ColorSpaceConversion colorSpaceConversion =
         static_cast<ColorSpaceConversion>(i);
     ImageBitmapOptions options =
         prepareBitmapOptionsAndSetRuntimeFlags(colorSpaceConversion);
     ImageBitmap* imageBitmap =
         ImageBitmap::create(imageData, cropRect, options);
 
-    // ColorBehavior::ignore() is used instead of
-    // ColorBehavior::transformToTargetForTesting() to avoid color conversion to
-    // display color profile, as we want to solely rely on the color correction
-    // that happens in ImageBitmap create method.
     SkImage* convertedImage =
-        imageBitmap->bitmapImage()
-            ->imageForCurrentFrame(ColorBehavior::ignore())
-            .get();
+        imageBitmap->bitmapImage()->imageForCurrentFrame().get();
 
     switch (colorSpaceConversion) {
       case ColorSpaceConversion::NONE:
         NOTREACHED();
         break;
       case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
       case ColorSpaceConversion::SRGB:
         colorSpace = SkColorSpace::MakeSRGB();
         colorFormat = colorFormat32;
         break;
@@ skipping 23 matching lines @@
     colorSpaceXform->apply(colorFormat, transformedPixel.get(), colorFormat32,
                            srcPixel.get(), 1,
                            SkAlphaType::kUnpremul_SkAlphaType);
     int compare = std::memcmp(convertedPixel.get(), transformedPixel.get(),
                               imageInfo.bytesPerPixel());
     ASSERT_EQ(compare, 0);
   }
 }
 
 }  // namespace blink