remove colorprofiletype from imageinfo

src/core/SkImageInfo.cpp

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageInfo.h"
 #include "SkImageInfoPriv.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 
+#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
+SkColorProfileType SkImageInfo::profileType() const {
+    return fColorSpace && fColorSpace->gammaCloseToSRGB()
+            ? kSRGB_SkColorProfileType : kLinear_SkColorProfileType;
+}
+#endif
+
 // Indicate how images and gradients should interpret colors by default.
 bool gDefaultProfileIsSRGB;
 
 SkColorProfileType SkDefaultColorProfile() {
     return gDefaultProfileIsSRGB ? kSRGB_SkColorProfileType
                                  : kLinear_SkColorProfileType;
 }
 
-static bool profile_type_is_valid(SkColorProfileType profileType) {
-    return (profileType >= 0) && (profileType <= kLastEnum_SkColorProfileType);
-}
-
 static bool alpha_type_is_valid(SkAlphaType alphaType) {
     return (alphaType >= 0) && (alphaType <= kLastEnum_SkAlphaType);
 }
 
 static bool color_type_is_valid(SkColorType colorType) {
     return (colorType >= 0) && (colorType <= kLastEnum_SkColorType);
 }
 
-SkImageInfo SkImageInfo::Make(int width, int height, SkColorType ct, SkAlphaType at,
-                              sk_sp<SkColorSpace> cs) {
-    SkColorProfileType pt = SkDefaultColorProfile();
-    // try to keep the enum and the colorspace in sync.
-    // TODO: eliminate the enum entirely, now that we have colorspace objects
-    if (cs && (SkColorSpace::kLinear_GammaNamed != cs->gammaNamed())) {
-        pt = kSRGB_SkColorProfileType;
-    }
-    return SkImageInfo(width, height, ct, at, pt, std::move(cs));
-}
-
 SkImageInfo SkImageInfo::MakeS32(int width, int height, SkAlphaType at) {
-    return SkImageInfo(width, height, kN32_SkColorType, at, kSRGB_SkColorProfileType,
+    return SkImageInfo(width, height, kN32_SkColorType, at,
                        SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named));
 }
 
 void SkImageInfo::unflatten(SkReadBuffer& buffer) {
     fWidth = buffer.read32();
     fHeight = buffer.read32();
 
     uint32_t packed = buffer.read32();
     SkASSERT(0 == (packed >> 24));
-    fProfileType = (SkColorProfileType)((packed >> 16) & 0xFF);
+//    fProfileType = (SkColorProfileType)((packed >> 16) & 0xFF);

[msarett, 2016/06/17 12:44:19]

I'll need to fix these to flatten/unflatten SkColorSpace...

[reed1, 2016/06/17 13:11:48]

Ooo right. I need to ponder that.

     fAlphaType = (SkAlphaType)((packed >> 8) & 0xFF);
     fColorType = (SkColorType)((packed >> 0) & 0xFF);
-    buffer.validate(profile_type_is_valid(fProfileType) &&
-                    alpha_type_is_valid(fAlphaType) &&
-                    color_type_is_valid(fColorType));
+    buffer.validate(alpha_type_is_valid(fAlphaType) && color_type_is_valid(fColorType));
 }
 
 void SkImageInfo::flatten(SkWriteBuffer& buffer) const {
     buffer.write32(fWidth);
     buffer.write32(fHeight);
 
-    SkASSERT(0 == (fProfileType & ~0xFF));
     SkASSERT(0 == (fAlphaType & ~0xFF));
     SkASSERT(0 == (fColorType & ~0xFF));
-    uint32_t packed = (fProfileType << 16) | (fAlphaType << 8) | fColorType;
+    uint32_t packed = /*(fProfileType << 16) |*/ (fAlphaType << 8) | fColorType;
     buffer.write32(packed);
 }
 
 bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
                                   SkAlphaType* canonical) {
     switch (colorType) {
         case kUnknown_SkColorType:
             alphaType = kUnknown_SkAlphaType;
             break;
         case kAlpha_8_SkColorType:
@@ skipping 58 matching lines @@
     }
     // here x,y are either 0 or negative
     fPixels = ((char*)fPixels - y * fRowBytes - x * fInfo.bytesPerPixel());
     // the intersect may have shrunk info's logical size
     fInfo = fInfo.makeWH(srcR.width(), srcR.height());
     fX = srcR.x();
     fY = srcR.y();
 
     return true;
 }