commit 23c5110ba291cfc303e3fdc73af99cd3d595df67
author msarett <msarett@google.com> Fri May 27 07:39:02 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri May 27 07:39:02 2016 -0700
tree e91dd207442d664baed99bdce4579011203908ba
parent 85f758c33446eaccfadc12292fa5a0e71d7661b9

Add SkColorSpace to SkImageInfo

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=2000713003

Review-Url: https://codereview.chromium.org/2000713003

include/codec/SkEncodedInfo.h

diff --git a/include/codec/SkEncodedInfo.h b/include/codec/SkEncodedInfo.h
index 0c5bd0b..d35aa2b 100644
--- a/include/codec/SkEncodedInfo.h
+++ b/include/codec/SkEncodedInfo.h
@@ -9,7 +9,8 @@
 #define SkEncodedInfo_DEFINED
 
 #include "SkImageInfo.h"
-#include "../private/SkImageInfoPriv.h"
+
+class SkColorSpace;
 
 struct SkEncodedInfo {
 public:
@@ -116,22 +117,21 @@
      * Returns an SkImageInfo with Skia color and alpha types that are the
      * closest possible match to the encoded info.
      */
-    SkImageInfo makeImageInfo(int width, int height) const {
-        SkColorProfileType profileType = SkDefaultColorProfile();
+    SkImageInfo makeImageInfo(int width, int height, const sk_sp<SkColorSpace>& colorSpace) const {
         switch (fColor) {
             case kGray_Color:
                 SkASSERT(kOpaque_Alpha == fAlpha);
                 return SkImageInfo::Make(width, height, kGray_8_SkColorType,
-                                         kOpaque_SkAlphaType, profileType);
+                                         kOpaque_SkAlphaType, colorSpace);
             case kGrayAlpha_Color:
                 SkASSERT(kOpaque_Alpha != fAlpha);
                 return SkImageInfo::Make(width, height, kN32_SkColorType,
-                        kUnpremul_SkAlphaType, profileType);
+                        kUnpremul_SkAlphaType, colorSpace);
             case kPalette_Color: {
                 SkAlphaType alphaType = (kOpaque_Alpha == fAlpha) ? kOpaque_SkAlphaType :
                         kUnpremul_SkAlphaType;
                 return SkImageInfo::Make(width, height, kIndex_8_SkColorType,
-                                         alphaType, profileType);
+                                         alphaType, colorSpace);
             }
             case kRGB_Color:
             case kBGR_Color:
@@ -141,13 +141,13 @@
             case kYCCK_Color:
                 SkASSERT(kOpaque_Alpha == fAlpha);
                 return SkImageInfo::Make(width, height, kN32_SkColorType,
-                                         kOpaque_SkAlphaType, profileType);
+                                         kOpaque_SkAlphaType, colorSpace);
             case kRGBA_Color:
             case kBGRA_Color:
             case kYUVA_Color:
                 SkASSERT(kOpaque_Alpha != fAlpha);
                 return SkImageInfo::Make(width, height, kN32_SkColorType,
-                                         kUnpremul_SkAlphaType, profileType);
+                                         kUnpremul_SkAlphaType, colorSpace);
             default:
                 SkASSERT(false);
                 return SkImageInfo::MakeUnknown();