Perform color correction on png decodes

src/codec/SkCodecPriv.h

 /*
  * Copyright 2015 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
@@ skipping 90 matching lines @@
             default:
                 // We cannot decode a non-opaque image to opaque (or unknown)
                 return false;
         }
     }
     return true;
 }
 
 /*
  * Most of our codecs support the same conversions:
- * - profileType must be the same
  * - opaque to any alpha type
  * - 565 only if opaque
  * - premul to unpremul and vice versa
  * - always support N32
  * - otherwise match the src color type
  */
 inline bool conversion_possible(const SkImageInfo& dst, const SkImageInfo& src) {
-    // FIXME: skbug.com/4895
-    // Currently, we ignore the SkColorProfileType on the SkImageInfo.  We
-    // will treat the encoded data as linear regardless of what the client
-    // requests.
-
     // Ensure the alpha type is valid
     if (!valid_alpha(dst.alphaType(), src.alphaType())) {
         return false;
     }
 
     // Check for supported color types
     switch (dst.colorType()) {
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
             return true;
@@ skipping 175 matching lines @@
         }
     } else {
         if (isRGBA) {
             return &SkPackARGB_as_RGBA;
         } else {
             return &SkPackARGB_as_BGRA;
         }
     }
 }
 
+inline bool needs_color_xform(const SkImageInfo& dstInfo, const SkImageInfo& srcInfo) {

[mtklein, 2016/07/29 18:48:56]

All these header methods should probably be non-exported, either static or in an
anonymous namespace.  (I like static, as you have to search less to find that
the function is static.)

It's a good rule of thumb that every function in a .h should start "static
inline"

[msarett, 2016/07/29 20:07:50]

Done.

+    // FIXME (msarett):
+    // Do a better check for color space equality.
+    return (kRGBA_F16_SkColorType == dstInfo.colorType()) ||
+           (dstInfo.colorSpace() && (dstInfo.colorSpace() != srcInfo.colorSpace()));
+}
+
 #endif // SkCodecPriv_DEFINED