commit 52ede1d905728cdcaa98db1e4a33724f5a85c62d
author brianosman <brianosman@google.com> Mon Jun 20 08:25:02 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 20 08:25:02 2016 -0700
tree 8c95fb157776dc2a561c8de731cac19cc78fa5a0
parent 0ed057542ce545da57cda92dc09c1da8b5fdc363

More removal of SkColorProfileType...

Scrub GMs. Remove the gDefaultProfile thing (it's unused now), along with
the command line flag that was setting it in DM and nanobench.

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

Committed: https://skia.googlesource.com/skia/+/944876f2745a62a839e49275daf93a0329372e67
Review-Url: https://codereview.chromium.org/2071393002

gm/all_bitmap_configs.cpp

diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp
index 7ea1746..b657f4f 100644
--- a/gm/all_bitmap_configs.cpp
+++ b/gm/all_bitmap_configs.cpp
@@ -246,13 +246,13 @@
 static void make_color_test_bitmap_variant(
     SkColorType colorType,
     SkAlphaType alphaType,
-    SkColorProfileType profile,
+    sk_sp<SkColorSpace> colorSpace,
     SkBitmap* bm)
 {
     SkASSERT(colorType == kRGBA_8888_SkColorType || colorType == kBGRA_8888_SkColorType);
     SkASSERT(alphaType == kPremul_SkAlphaType || alphaType == kUnpremul_SkAlphaType);
     bm->allocPixels(
-        SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, profile));
+        SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, colorSpace));
     SkPixmap pm;
     bm->peekPixels(&pm);
     for (int y = 0; y < bm->height(); y++) {
@@ -265,13 +265,17 @@
 DEF_SIMPLE_GM(all_variants_8888, canvas, 4 * SCALE + 30, 2 * SCALE + 10) {
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
 
-    for (auto profile : {kSRGB_SkColorProfileType, kLinear_SkColorProfileType}) {
+    sk_sp<SkColorSpace> colorSpaces[] {
+        nullptr,
+        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)
+    };
+    for (auto colorSpace : colorSpaces) {
         canvas->save();
         for (auto alphaType : {kPremul_SkAlphaType, kUnpremul_SkAlphaType}) {
             canvas->save();
             for (auto colorType : {kRGBA_8888_SkColorType, kBGRA_8888_SkColorType}) {
                 SkBitmap bm;
-                make_color_test_bitmap_variant(colorType, alphaType, profile, &bm);
+                make_color_test_bitmap_variant(colorType, alphaType, colorSpace, &bm);
                 canvas->drawBitmap(bm, 0.0f, 0.0f);
                 canvas->translate(SCALE + 10, 0.0f);
             }