Rename SkSourceGammaTreatment to SkDestinationSurfaceColorMode

This is much more explicit about what that type represents (are we in
legacy mode or not), which also makes it suitable for other (upcoming)
usage.

BUG=skia:

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

Change-Id: Iacb397c34e7765f1ca86c0195bc622b2be4d9acf
Reviewed-on: https://skia-review.googlesource.com/4529
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

4 files changed, 28 insertions, 26 deletions

diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp
index 8cbd287f3b..903024b8ee 100644
--- a/gm/image_pict.cpp
+++ b/gm/image_pict.cpp
@@ -314,10 +314,9 @@ protected:
 
     static void draw_as_tex(SkCanvas* canvas, SkImageCacherator* cache, SkScalar x, SkScalar y) {
 #if SK_SUPPORT_GPU
-        sk_sp<GrTexture> texture(cache->lockAsTexture(canvas->getGrContext(),
-                                                      GrTextureParams::ClampBilerp(),
-                                                      SkSourceGammaTreatment::kRespect,
-                                                      nullptr));
+        sk_sp<GrTexture> texture(
+            cache->lockAsTexture(canvas->getGrContext(), GrTextureParams::ClampBilerp(),
+                                 SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware, nullptr));
         if (!texture) {
             // show placeholder if we have no texture
             SkPaint paint;
diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp
index 2386e1d3c1..a4fd16404f 100644
--- a/gm/showmiplevels.cpp
+++ b/gm/showmiplevels.cpp
@@ -139,8 +139,8 @@ protected:
         baseBM.lockPixels();
         baseBM.peekPixels(&prevPM);
 
-        SkSourceGammaTreatment treatment = SkSourceGammaTreatment::kIgnore;
-        sk_sp<SkMipMap> mm(SkMipMap::Build(baseBM, treatment, nullptr));
+        SkDestinationSurfaceColorMode colorMode = SkDestinationSurfaceColorMode::kLegacy;
+        sk_sp<SkMipMap> mm(SkMipMap::Build(baseBM, colorMode, nullptr));
 
         int index = 0;
         SkMipMap::Level level;
@@ -250,8 +250,8 @@ protected:
         SkScalar x = 4;
         SkScalar y = 4;
 
-        SkSourceGammaTreatment treatment = SkSourceGammaTreatment::kIgnore;
-        sk_sp<SkMipMap> mm(SkMipMap::Build(baseBM, treatment, nullptr));
+        SkDestinationSurfaceColorMode colorMode = SkDestinationSurfaceColorMode::kLegacy;
+        sk_sp<SkMipMap> mm(SkMipMap::Build(baseBM, colorMode, nullptr));
 
         int index = 0;
         SkMipMap::Level level;
diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp
index cac193b205..b76c70ebc5 100644
--- a/gm/texturedomaineffect.cpp
+++ b/gm/texturedomaineffect.cpp
@@ -82,9 +82,9 @@ protected:
             return;
         }
 
-        sk_sp<GrTexture> texture(GrRefCachedBitmapTexture(context, fBmp,
-                                                          GrTextureParams::ClampNoFilter(),
-                                                          SkSourceGammaTreatment::kRespect));
+        sk_sp<GrTexture> texture(
+            GrRefCachedBitmapTexture(context, fBmp, GrTextureParams::ClampNoFilter(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
         if (!texture) {
             return;
         }
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index e3b78a6b66..307ea7c6dd 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -81,15 +81,15 @@ protected:
         }
 
         sk_sp<GrTexture> texture[3];
-        texture[0].reset(GrRefCachedBitmapTexture(context, fBmp[0],
-                                                  GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
-        texture[1].reset(GrRefCachedBitmapTexture(context, fBmp[1],
-                                                  GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
-        texture[2].reset(GrRefCachedBitmapTexture(context, fBmp[2],
-                                                  GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
+        texture[0].reset(
+            GrRefCachedBitmapTexture(context, fBmp[0], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
+        texture[1].reset(
+            GrRefCachedBitmapTexture(context, fBmp[1], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
+        texture[2].reset(
+            GrRefCachedBitmapTexture(context, fBmp[2], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
 
         if (!texture[0] || !texture[1] || !texture[2]) {
             return;
@@ -206,12 +206,15 @@ protected:
         }
 
         sk_sp<GrTexture> texture[3];
-        texture[0].reset(GrRefCachedBitmapTexture(context, fBmp[0], GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
-        texture[1].reset(GrRefCachedBitmapTexture(context, fBmp[1], GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
-        texture[2].reset(GrRefCachedBitmapTexture(context, fBmp[1], GrTextureParams::ClampBilerp(),
-                                                  SkSourceGammaTreatment::kRespect));
+        texture[0].reset(
+            GrRefCachedBitmapTexture(context, fBmp[0], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
+        texture[1].reset(
+            GrRefCachedBitmapTexture(context, fBmp[1], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
+        texture[2].reset(
+            GrRefCachedBitmapTexture(context, fBmp[1], GrTextureParams::ClampBilerp(),
+                                     SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware));
 
         if (!texture[0] || !texture[1] || !texture[2]) {
             return;