fix name of Display P3 gamut

The gamut named "SkNamedGamut::kDCIP3" is really the slightly different
Display P3 gamut.  This is a no-op refactor; the matrices are bitwise
identical in Skia.

Bug: skia:9792
Change-Id: I4405206337b919453d9cb58a09d9331f54591305
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216159Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Mike Klein <mtklein@google.com>
Cr-Commit-Position: refs/heads/master@{#773153}

third_party/blink/renderer/bindings/core/v8/serialization/v8_script_value_serializer_test.cc

@@ -1043,9 +1043,10 @@ TEST(V8ScriptValueSerializerTest, RoundTripImageBitmap) {
 TEST(V8ScriptValueSerializerTest, RoundTripImageBitmapWithColorSpaceInfo) {
   V8TestingScope scope;
   // Make a 10x7 red ImageBitmap in P3 color space.
-  SkImageInfo info = SkImageInfo::Make(
-      10, 7, kRGBA_F16_SkColorType, kPremul_SkAlphaType,
-      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kDCIP3));
+  SkImageInfo info =
+      SkImageInfo::Make(10, 7, kRGBA_F16_SkColorType, kPremul_SkAlphaType,
+                        SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear,
+                                              SkNamedGamut::kDisplayP3));
   sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
   surface->getCanvas()->clear(SK_ColorRED);
   auto* image_bitmap = MakeGarbageCollected<ImageBitmap>(
@@ -1149,9 +1150,10 @@ TEST(V8ScriptValueSerializerTest, DecodeImageBitmapV18) {
 
   // Check that the pixel at (1, 0) is red.
   uint8_t pixel[8] = {};
-  SkImageInfo info = SkImageInfo::Make(
-      1, 1, kRGBA_F16_SkColorType, kPremul_SkAlphaType,
-      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kDCIP3));
+  SkImageInfo info =
+      SkImageInfo::Make(1, 1, kRGBA_F16_SkColorType, kPremul_SkAlphaType,
+                        SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear,
+                                              SkNamedGamut::kDisplayP3));
   ASSERT_TRUE(new_image_bitmap->BitmapImage()
                   ->PaintImageForCurrentFrame()
                   .GetSkImage()

third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc

@@ -641,7 +641,7 @@ sk_sp<SkColorSpace> CanvasAsyncBlobCreator::BlobColorSpaceToSkColorSpace(
     String blob_color_space) {
   skcms_Matrix3x3 gamut = SkNamedGamut::kSRGB;
   if (blob_color_space == kDisplayP3ImageColorSpaceName)
-    gamut = SkNamedGamut::kDCIP3;
+    gamut = SkNamedGamut::kDisplayP3;
   else if (blob_color_space == kRec2020ImageColorSpaceName)
     gamut = SkNamedGamut::kRec2020;
   return SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, gamut);

third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator_test.cc

@@ -248,7 +248,8 @@ TEST_F(CanvasAsyncBlobCreatorTest, ColorManagedConvertToBlob) {
   color_space_params.push_back(std::pair<sk_sp<SkColorSpace>, SkColorType>(
       SkColorSpace::MakeSRGBLinear(), kRGBA_F16_SkColorType));
   color_space_params.push_back(std::pair<sk_sp<SkColorSpace>, SkColorType>(
-      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kDCIP3),
+      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear,
+                            SkNamedGamut::kDisplayP3),
       kRGBA_F16_SkColorType));
   color_space_params.push_back(std::pair<sk_sp<SkColorSpace>, SkColorType>(
       SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kRec2020),

third_party/blink/renderer/core/imagebitmap/image_bitmap_test.cc

@@ -340,8 +340,8 @@ TEST_F(ImageBitmapTest, ImageBitmapPixelFormat) {
   // internal SkImage back storage.
   ASSERT_EQ(sk_image_internal, sk_image_internal_8888);
 
-  sk_sp<SkColorSpace> p3_color_space =
-      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kDCIP3);
+  sk_sp<SkColorSpace> p3_color_space = SkColorSpace::MakeRGB(
+      SkNamedTransferFn::kLinear, SkNamedGamut::kDisplayP3);
   SkImageInfo info_f16 = SkImageInfo::Make(10, 10, kRGBA_F16_SkColorType,
                                            kPremul_SkAlphaType, p3_color_space);
   sk_sp<SkSurface> surface_f16(SkSurface::MakeRaster(info_f16));

third_party/blink/renderer/platform/graphics/canvas_color_params.cc

@@ -127,7 +127,7 @@ sk_sp<SkColorSpace> CanvasColorParams::GetSkColorSpace() const {
       transferFn = SkNamedTransferFn::kLinear;
       break;
     case CanvasColorSpace::kP3:
-      gamut = SkNamedGamut::kDCIP3;
+      gamut = SkNamedGamut::kDisplayP3;
       transferFn = SkNamedTransferFn::kLinear;
       break;
   }
@@ -217,7 +217,7 @@ CanvasColorParams::CanvasColorParams(const sk_sp<SkColorSpace> color_space,
   } else if (SkColorSpace::Equals(
                  color_space.get(),
                  SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear,
-                                       SkNamedGamut::kDCIP3)
+                                       SkNamedGamut::kDisplayP3)
                      .get())) {
     color_space_ = CanvasColorSpace::kP3;
   }

ui/gfx/color_space.cc

@@ -630,7 +630,7 @@ sk_sp<SkColorSpace> ColorSpace::ToSkColorSpace() const {
       gamut = SkNamedGamut::kAdobeRGB;
       break;
     case PrimaryID::SMPTEST432_1:
-      gamut = SkNamedGamut::kDCIP3;
+      gamut = SkNamedGamut::kDisplayP3;
       break;
     case PrimaryID::BT2020:
       gamut = SkNamedGamut::kRec2020;

ui/gfx/color_space_unittest.cc

@@ -120,7 +120,8 @@ TEST(ColorSpace, ConversionToAndFromSkColorSpace) {
   sk_sp<SkColorSpace> sk_color_spaces[kNumTests] = {
       SkColorSpace::MakeSRGB(),
       SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, SkNamedGamut::kAdobeRGB),
-      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear, SkNamedGamut::kDCIP3),
+      SkColorSpace::MakeRGB(SkNamedTransferFn::kLinear,
+                            SkNamedGamut::kDisplayP3),
       SkColorSpace::MakeRGB(SkNamedTransferFn::kSRGB, SkNamedGamut::kRec2020),
       SkColorSpace::MakeRGB(transfer_fn, primary_matrix),
   };