Keep SkColorSpace and SkColorProfileType in sync

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
@@ skipping 180 matching lines @@
         : fColorSpace(nullptr)
         , fWidth(0)
         , fHeight(0)
         , fColorType(kUnknown_SkColorType)
         , fAlphaType(kUnknown_SkAlphaType)
         , fProfileType(kLinear_SkColorProfileType)
     {}
 
     static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
                             SkColorProfileType pt = kLinear_SkColorProfileType) {
-        return SkImageInfo(width, height, ct, at, pt, nullptr);
+        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
+                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
+        return SkImageInfo(width, height, ct, at, pt, cs);
     }
 
     static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
                             sk_sp<SkColorSpace> cs);
 
     /**
      *  Sets colortype to the native ARGB32 type.
      */
     static SkImageInfo MakeN32(int width, int height, SkAlphaType at,
                                SkColorProfileType pt = kLinear_SkColorProfileType) {
-        return SkImageInfo(width, height, kN32_SkColorType, at, pt, nullptr);
+        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
+                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
+        return SkImageInfo(width, height, kN32_SkColorType, at, pt, cs);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
     static SkImageInfo MakeN32Premul(int width, int height,
                                      SkColorProfileType pt = kLinear_SkColorProfileType) {
-        return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType, pt, nullptr);
+        sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
+                                 SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
+        return SkImageInfo(width, height, kN32_SkColorType, kPremul_SkAlphaType, pt, cs);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
      */
     static SkImageInfo MakeN32Premul(const SkISize& size,
                                      SkColorProfileType pt = kLinear_SkColorProfileType) {
         return MakeN32Premul(size.width(), size.height(), pt);
     }
 
@@ skipping 144 matching lines @@
 
 static inline bool SkColorAndProfileAreGammaCorrect(SkColorType ct, SkColorProfileType pt) {
     return kSRGB_SkColorProfileType == pt || kRGBA_F16_SkColorType == ct;
 }
 
 static inline bool SkImageInfoIsGammaCorrect(const SkImageInfo& info) {
     return SkColorAndProfileAreGammaCorrect(info.colorType(), info.profileType());
 }
 
 #endif