Revert of More removal of SkColorProfileType...

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"
 
 /*
  *  We store this as a byte in the ImageInfo flatten buffer.
  */
 enum class SkFlattenColorSpaceEnum {
     kUnspecified,
     kSRGB,
     kAdobe1998,
@@ skipping 34 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #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 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::MakeS32(int width, int height, SkAlphaType at) {
     return SkImageInfo(width, height, kN32_SkColorType, at,
@@ skipping 113 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;
 }