Update callsites to new SkColorSpace API, delete legacy flag

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 226 matching lines @@
 
   return options;
 }
 
 TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionHTMLImageElement) {
   HTMLImageElement* imageElement =
       HTMLImageElement::create(*Document::create());
 
   SkPaint p;
   p.setColor(SK_ColorRED);
-  sk_sp<SkColorSpace> srcRGBColorSpace =
-      SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+  sk_sp<SkColorSpace> srcRGBColorSpace = SkColorSpace::MakeSRGB();
 
   SkImageInfo rasterImageInfo =
       SkImageInfo::MakeN32Premul(10, 10, srcRGBColorSpace);
   sk_sp<SkSurface> surface(SkSurface::MakeRaster(rasterImageInfo));
   surface->getCanvas()->drawCircle(5, 5, 5, p);
   sk_sp<SkImage> image = surface->makeImageSnapshot();
 
   std::unique_ptr<uint8_t[]> srcPixel(
       new uint8_t[rasterImageInfo.bytesPerPixel()]());
   image->readPixels(rasterImageInfo.makeWH(1, 1), srcPixel.get(),
@@ skipping 40 matching lines @@
     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:
       case ColorSpaceConversion::SRGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+        colorSpace = SkColorSpace::MakeSRGB();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::LINEAR_RGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+        colorSpace = SkColorSpace::MakeSRGBLinear();
         colorType = SkColorType::kRGBA_F16_SkColorType;
         colorFormat = SkColorSpaceXform::ColorFormat::kRGBA_F16_ColorFormat;
         break;
       default:
         NOTREACHED();
     }
 
     SkImageInfo imageInfo = SkImageInfo::Make(
         1, 1, colorType, SkAlphaType::kPremul_SkAlphaType, colorSpace);
     std::unique_ptr<uint8_t[]> convertedPixel(
@@ skipping 16 matching lines @@
     ASSERT_EQ(compare, 0);
   }
 }
 
 TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionImageBitmap) {
   HTMLImageElement* imageElement =
       HTMLImageElement::create(*Document::create());
 
   SkPaint p;
   p.setColor(SK_ColorRED);
-  sk_sp<SkColorSpace> srcRGBColorSpace =
-      SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+  sk_sp<SkColorSpace> srcRGBColorSpace = SkColorSpace::MakeSRGB();
 
   SkImageInfo rasterImageInfo =
       SkImageInfo::MakeN32Premul(10, 10, srcRGBColorSpace);
   sk_sp<SkSurface> surface(SkSurface::MakeRaster(rasterImageInfo));
   surface->getCanvas()->drawCircle(5, 5, 5, p);
   sk_sp<SkImage> image = surface->makeImageSnapshot();
 
   std::unique_ptr<uint8_t[]> srcPixel(
       new uint8_t[rasterImageInfo.bytesPerPixel()]());
   image->readPixels(rasterImageInfo.makeWH(1, 1), srcPixel.get(),
@@ skipping 37 matching lines @@
     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:
       case ColorSpaceConversion::SRGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+        colorSpace = SkColorSpace::MakeSRGB();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::LINEAR_RGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+        colorSpace = SkColorSpace::MakeSRGBLinear();
         colorType = SkColorType::kRGBA_F16_SkColorType;
         colorFormat = SkColorSpaceXform::ColorFormat::kRGBA_F16_ColorFormat;
         break;
       default:
         NOTREACHED();
     }
 
     SkImageInfo imageInfo = SkImageInfo::Make(
         1, 1, colorType, SkAlphaType::kPremul_SkAlphaType, colorSpace);
     std::unique_ptr<uint8_t[]> convertedPixel(
@@ skipping 13 matching lines @@
 
     int compare = std::memcmp(convertedPixel.get(), transformedPixel.get(),
                               imageInfo.bytesPerPixel());
     ASSERT_EQ(compare, 0);
   }
 }
 
 TEST_F(ImageBitmapTest, ImageBitmapColorSpaceConversionStaticBitmapImage) {
   SkPaint p;
   p.setColor(SK_ColorRED);
-  sk_sp<SkColorSpace> srcRGBColorSpace =
-      SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+  sk_sp<SkColorSpace> srcRGBColorSpace = SkColorSpace::MakeSRGB();
 
   SkImageInfo rasterImageInfo =
       SkImageInfo::MakeN32Premul(10, 10, srcRGBColorSpace);
   sk_sp<SkSurface> surface(SkSurface::MakeRaster(rasterImageInfo));
   surface->getCanvas()->drawCircle(5, 5, 5, p);
   sk_sp<SkImage> image = surface->makeImageSnapshot();
 
   std::unique_ptr<uint8_t[]> srcPixel(
       new uint8_t[rasterImageInfo.bytesPerPixel()]());
   image->readPixels(rasterImageInfo.makeWH(1, 1), srcPixel.get(),
@@ skipping 31 matching lines @@
     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:
       case ColorSpaceConversion::SRGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+        colorSpace = SkColorSpace::MakeSRGB();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::LINEAR_RGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+        colorSpace = SkColorSpace::MakeSRGBLinear();
         colorType = SkColorType::kRGBA_F16_SkColorType;
         colorFormat = SkColorSpaceXform::ColorFormat::kRGBA_F16_ColorFormat;
         break;
       default:
         NOTREACHED();
     }
 
     SkImageInfo imageInfo = SkImageInfo::Make(
         1, 1, colorType, SkAlphaType::kPremul_SkAlphaType, colorSpace);
     std::unique_ptr<uint8_t[]> convertedPixel(
@@ skipping 52 matching lines @@
         imageBitmap->bitmapImage()
             ->imageForCurrentFrame(ColorBehavior::ignore())
             .get();
 
     switch (colorSpaceConversion) {
       case ColorSpaceConversion::NONE:
         NOTREACHED();
         break;
       case ColorSpaceConversion::DEFAULT_COLOR_CORRECTED:
       case ColorSpaceConversion::SRGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+        colorSpace = SkColorSpace::MakeSRGB();
         colorFormat = colorFormat32;
         break;
       case ColorSpaceConversion::LINEAR_RGB:
-        colorSpace = SkColorSpace::MakeNamed(SkColorSpace::kSRGBLinear_Named);
+        colorSpace = SkColorSpace::MakeSRGBLinear();
         colorType = SkColorType::kRGBA_F16_SkColorType;
         colorFormat = SkColorSpaceXform::ColorFormat::kRGBA_F16_ColorFormat;
         break;
       default:
         NOTREACHED();
     }
 
     SkImageInfo imageInfo = SkImageInfo::Make(
         1, 1, colorType, SkAlphaType::kUnpremul_SkAlphaType, colorSpace);
     std::unique_ptr<uint8_t[]> convertedPixel(
@@ skipping 11 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