Add SkColorSpace to SkImageInfo

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
 
+#include "SkColorSpace.h"
 #include "SkMath.h"
 #include "SkRect.h"
 #include "SkSize.h"
 
 class SkReadBuffer;
 class SkWriteBuffer;
 
 /**
  *  Describes how to interpret the alpha component of a pixel.
  */
@@ skipping 166 matching lines @@
         , 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);
     }
 
+    static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
+                            sk_sp<SkColorSpace> cs) {
+        return SkImageInfo(width, height, ct, at, kLinear_SkColorProfileType, 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);
     }
 
     /**
      *  Sets colortype to the native ARGB32 type, and the alphatype to premul.
@@ skipping 22 matching lines @@
     }
 
     static SkImageInfo MakeUnknown() {
         return SkImageInfo();
     }
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
     SkColorType colorType() const { return fColorType; }
     SkAlphaType alphaType() const { return fAlphaType; }
     SkColorProfileType profileType() const { return fProfileType; }

[reed1, 2016/05/24 16:06:33]

would this guy be deprecated?

[msarett, 2016/05/24 19:01:47]

Yes, though I think there is plenty of work to do in order to transition. 
Should we go ahead and mark it as deprecated?

 
     bool isEmpty() const { return fWidth <= 0 || fHeight <= 0; }
 
     bool isOpaque() const {
         return SkAlphaTypeIsOpaque(fAlphaType);
     }
 
     bool isLinear() const { return kLinear_SkColorProfileType == fProfileType; }
     bool isSRGB() const { return kSRGB_SkColorProfileType == fProfileType; }
 
+    bool isLinearGamma() const {
+        return SkColorSpace::kLinear_GammaNamed == fColorSpace->gammaNamed();
+    }
+
+    bool is2Dot2Gamma() const {
+        return SkColorSpace::k2Dot2Curve_GammaNamed == fColorSpace->gammaNamed();

[reed1, 2016/05/24 16:06:33]

Must there be a colorspace object, or could it be null?

[msarett, 2016/05/24 19:01:47]

Ahhh yes this is a bug.  It could definitely be null.  In terms of images, I
think we should say null (meaning unmarked) == 2Dot2.  I've made this change.

Will this break our assumptions anywhere else?  In that case, I can pass a
pointer to the sRGB color space when the image doesn't have one, so that way we
can say null == Linear (and images will always be 2Dot2).

+    }
+
     SkISize dimensions() const { return SkISize::Make(fWidth, fHeight); }
     SkIRect bounds() const { return SkIRect::MakeWH(fWidth, fHeight); }
 
     /**
      *  Return a new ImageInfo with the same colortype and alphatype as this info,
      *  but with the specified width and height.
      */
     SkImageInfo makeWH(int newWidth, int newHeight) const {
         return SkImageInfo::Make(newWidth, newHeight, fColorType, fAlphaType, fProfileType);
     }
@@ skipping 55 matching lines @@
     }
 
     SkDEBUGCODE(void validate() const;)
 
 private:
     int                 fWidth;
     int                 fHeight;
     SkColorType         fColorType;
     SkAlphaType         fAlphaType;
     SkColorProfileType  fProfileType;
+    sk_sp<SkColorSpace> fColorSpace;
 
-    SkImageInfo(int width, int height, SkColorType ct, SkAlphaType at, SkColorProfileType pt)
+    SkImageInfo(int width, int height, SkColorType ct, SkAlphaType at, SkColorProfileType pt,
+                sk_sp<SkColorSpace> cs = nullptr)
         : fWidth(width)
         , fHeight(height)
         , fColorType(ct)
         , fAlphaType(at)
         , fProfileType(pt)
+        , fColorSpace(cs)
     {}
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 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