Revert of More removal of SkColorProfileType...

gm/all_bitmap_configs.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkSurface.h"
 #include "Resources.h"
@@ skipping 228 matching lines @@
         default:
             SkFAIL("Should not get here - invalid alpha type");
             return 0xFF000000;
     }
     return alpha << 24 | component;
 }
 
 static void make_color_test_bitmap_variant(
     SkColorType colorType,
     SkAlphaType alphaType,
-    sk_sp<SkColorSpace> colorSpace,
+    SkColorProfileType profile,
     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, colorSpace));
+        SkImageInfo::Make(SCALE, SCALE, colorType, alphaType, profile));
     SkPixmap pm;
     bm->peekPixels(&pm);
     for (int y = 0; y < bm->height(); y++) {
         for (int x = 0; x < bm->width(); x++) {
             *pm.writable_addr32(x, y) = make_pixel(x, y, alphaType);
         }
     }
 }
 
 DEF_SIMPLE_GM(all_variants_8888, canvas, 4 * SCALE + 30, 2 * SCALE + 10) {
     sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
 
-    sk_sp<SkColorSpace> colorSpaces[] {
-        nullptr,
-        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)
-    };
-    for (auto colorSpace : colorSpaces) {
+    for (auto profile : {kSRGB_SkColorProfileType, kLinear_SkColorProfileType}) {
         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, colorSpace, &bm);
+                make_color_test_bitmap_variant(colorType, alphaType, profile, &bm);
                 canvas->drawBitmap(bm, 0.0f, 0.0f);
                 canvas->translate(SCALE + 10, 0.0f);
             }
             canvas->restore();
             canvas->translate(0.0f, SCALE + 10);
         }
         canvas->restore();
         canvas->translate(2 * (SCALE + 10), 0.0f);
     }
 }