Rename SkColorSpace::GammaNamed to SkColorSpace::RenderTargetGamma

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2319293002

Review-Url: https://codereview.chromium.org/2319293002

diff --git a/gm/color4f.cpp b/gm/color4f.cpp
index b3be57b..2f86842 100644 (file)
--- a/gm/color4f.cpp
+++ b/gm/color4f.cpp
@@ -112,8 +112,8 @@ DEF_SIMPLE_GM(color4shader, canvas, 1024, 260) {
         sk_sp<SkShader> shaders[] {
             SkShader::MakeColorShader(c4, nullptr),
             SkShader::MakeColorShader(c4, SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)),
-            SkShader::MakeColorShader(c4, SkColorSpace::NewRGB(SkColorSpace::kLinear_GammaNamed,
-                                                               mat)),
+            SkShader::MakeColorShader(c4,
+                    SkColorSpace::NewRGB(SkColorSpace::kLinear_RenderTargetGamma, mat)),
         };
 
         canvas->save();

diff --git a/gm/gamut.cpp b/gm/gamut.cpp
index 41ce283..a1bea3c 100644 (file)
--- a/gm/gamut.cpp
+++ b/gm/gamut.cpp
@@ -117,7 +117,8 @@ static void draw_gamut_grid(SkCanvas* canvas, SkTArray<SkAutoTDelete<CellRendere
     // Use the original canvas' color type, but account for gamma requirements
     SkImageInfo origInfo = canvas->imageInfo();
     auto srgbCS = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
-    auto wideCS = SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed, wideGamutRGB_toXYZD50);
+    auto wideCS = SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma,
+                                       wideGamutRGB_toXYZD50);
     switch (origInfo.colorType()) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:

diff --git a/include/core/SkColorSpace.h b/include/core/SkColorSpace.h
index 715cc40..b335865 100644 (file)
--- a/include/core/SkColorSpace.h
+++ b/include/core/SkColorSpace.h
@@ -33,20 +33,23 @@ public:
         kAdobeRGB_Named,
     };
 
-    enum GammaNamed : uint8_t {
-        kLinear_GammaNamed,
+    enum RenderTargetGamma : uint8_t {
+        kLinear_RenderTargetGamma,
 
         /**
          *  Transfer function is the canonical sRGB curve, which has a short linear segment
          *  followed by a 2.4f exponential.
          */
-        kSRGB_GammaNamed,
+        kSRGB_RenderTargetGamma,
+
+        // DO NOT USE: Being deleted.
+        kLinear_GammaNamed = kLinear_RenderTargetGamma,
     };
 
     /**
-     *  Create an SkColorSpace from the src gamma and a transform from src gamut to D50 XYZ.
+     *  Create an SkColorSpace from a transfer function and a color gamut transform to D50 XYZ.
      */
-    static sk_sp<SkColorSpace> NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50);
+    static sk_sp<SkColorSpace> NewRGB(RenderTargetGamma gamma, const SkMatrix44& toXYZD50);
 
     /**
      *  Create a common, named SkColorSpace.

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index 1b8cadb..a268c1f 100644 (file)
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -329,7 +329,7 @@ sk_sp<SkColorSpace> read_color_space(png_structp png_ptr, png_infop info_ptr) {
 
         // Default to sRGB gamma if the image has color space information,
         // but does not specify gamma.
-        return SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed, toXYZD50);
+        return SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma, toXYZD50);
     }
 
     // Last, check for gamma.

diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index 647795f..e667606 100644 (file)
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -121,11 +121,11 @@ sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(SkGammaNamed gammaNamed, const SkM
     return sk_sp<SkColorSpace>(new SkColorSpace_Base(gammaNamed, toXYZD50));
 }
 
-sk_sp<SkColorSpace> SkColorSpace::NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50) {
-    switch (gammaNamed) {
-        case kLinear_GammaNamed:
+sk_sp<SkColorSpace> SkColorSpace::NewRGB(RenderTargetGamma gamma, const SkMatrix44& toXYZD50) {
+    switch (gamma) {
+        case kLinear_RenderTargetGamma:
             return SkColorSpace_Base::NewRGB(kLinear_SkGammaNamed, toXYZD50);
-        case kSRGB_GammaNamed:
+        case kSRGB_RenderTargetGamma:
             return SkColorSpace_Base::NewRGB(kSRGB_SkGammaNamed, toXYZD50);
         default:
             return nullptr;

diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index cd69598..67015c7 100644 (file)
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -102,14 +102,14 @@ DEF_TEST(ColorSpaceSRGBCompare, r) {
     // Create an sRGB color space by value
     SkMatrix44 srgbToxyzD50(SkMatrix44::kUninitialized_Constructor);
     srgbToxyzD50.set3x3RowMajorf(g_sRGB_XYZ);
-    sk_sp<SkColorSpace> rgbColorSpace = SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed,
-                                                             srgbToxyzD50);
+    sk_sp<SkColorSpace> rgbColorSpace =
+            SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma, srgbToxyzD50);
     REPORTER_ASSERT(r, rgbColorSpace == namedColorSpace);
 
     // Change a single value from the sRGB matrix
     srgbToxyzD50.set(2, 2, 0.5f);
-    sk_sp<SkColorSpace> strangeColorSpace = SkColorSpace::NewRGB(SkColorSpace::kSRGB_GammaNamed,
-                                                                 srgbToxyzD50);
+    sk_sp<SkColorSpace> strangeColorSpace =
+            SkColorSpace::NewRGB(SkColorSpace::kSRGB_RenderTargetGamma, srgbToxyzD50);
     REPORTER_ASSERT(r, strangeColorSpace != namedColorSpace);
 }