Lots of progress switching to SkColorSpace rather than SkColorProfileType

tools/picture_utils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "picture_utils.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 62 matching lines @@
 
     sk_sp<SkData> encode_bitmap_for_png(SkBitmap bitmap) {
         const int w = bitmap.width(),
                 h = bitmap.height();
         // PNG wants unpremultiplied 8-bit RGBA pixels (16-bit could work fine too).
         // We leave the gamma of these bytes unspecified, to continue the status quo,
         // which we think generally is to interpret them as sRGB.
 
         SkAutoTMalloc<uint32_t> rgba(w*h);
 
-        if (bitmap.  colorType() ==  kN32_SkColorType &&
-            bitmap.profileType() == kSRGB_SkColorProfileType) {
+        auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+        if (bitmap. colorType() ==  kN32_SkColorType &&
+            bitmap.colorSpace() == srgbColorSpace.get()) {
             // These are premul sRGB 8-bit pixels in SkPMColor order.
             // We want unpremul sRGB 8-bit pixels in RGBA order.  We'll get there via floats.
             bitmap.lockPixels();
             auto px = (const uint32_t*)bitmap.getPixels();
             if (!px) {
                 return nullptr;
             }
             for (int i = 0; i < w*h; i++) {
                 Sk4f fs = Sk4f_fromS32(px[i]);         // Convert up to linear floats.
 #if defined(SK_PMCOLOR_IS_BGRA)
@@ skipping 42 matching lines @@
                                                      kUnpremul_SkAlphaType),
                                    rgba, 4*w, 0,0)) {
                 return nullptr;
             }
         }
 
         return SkData::MakeFromMalloc(rgba.release(), w*h*sizeof(uint32_t));
     }
 
 } // namespace sk_tools