Add usage metrics for display and image color profiles

third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  *
  * Portions are Copyright (C) 2001 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 139 matching lines @@
     void createRowBuffer(int size) { m_rowBuffer = adoptArrayPtr(new png_byte[size]); }
     qcms_transform* colorTransform() const { return m_transform; }
 
     void clearColorTransform()
     {
         if (m_transform)
             qcms_transform_release(m_transform);
         m_transform = 0;
     }
 
-    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha, bool sRGB)
+    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha, bool sRGB, ColorProfileStatus* status)
     {
         clearColorTransform();
 
         if (colorProfile.isEmpty() && !sRGB)
             return;
-        qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
-        if (!deviceProfile)
-            return;
         qcms_profile* inputProfile = 0;
         if (!colorProfile.isEmpty())
             inputProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
         else
             inputProfile = qcms_profile_sRGB();
-        if (!inputProfile)
+        if (!inputProfile) {
+            *status = ColorProfileFailedDecode;

[Noel Gordon, 2015/12/23 15:28:48]

ColorProfileFailedDecode -> ColorProfileInvalidContent

+            return;
+        }
+        qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
+        if (!deviceProfile)
             return;
         // We currently only support color profiles for RGB and RGBA images.
         ASSERT(rgbData == qcms_profile_get_color_space(inputProfile));
         qcms_data_type dataFormat = hasAlpha ? QCMS_DATA_RGBA_8 : QCMS_DATA_RGB_8;
         // FIXME: Don't force perceptual intent if the image profile contains an intent.
         m_transform = qcms_transform_create(inputProfile, dataFormat, deviceProfile, dataFormat, QCMS_INTENT_PERCEPTUAL);
         qcms_profile_release(inputProfile);
     }
 #endif
 
@@ skipping 17 matching lines @@
     , m_hasColorProfile(false)
     , m_offset(offset)
 {
 }
 
 PNGImageDecoder::~PNGImageDecoder()
 {
 }
 
 #if USE(QCMSLIB)
-static void getColorProfile(png_structp png, png_infop info, ColorProfile& colorProfile, bool& sRGB)
+static void getColorProfile(png_structp png, png_infop info, ColorProfile& colorProfile, bool& sRGB, ColorProfileStatus& status)
 {
 #ifdef PNG_iCCP_SUPPORTED
     ASSERT(colorProfile.isEmpty());
     if (png_get_valid(png, info, PNG_INFO_sRGB)) {
         sRGB = true;
+        status = ColorProfileSuccess_PNGsRGB;

[Noel Gordon, 2015/12/23 15:28:48]

ColorProfileSuccess_PNGsRGB -> ColorProfileSuccessEmbeddedsRGB

I'm thinking the following will be needed later

ColorProfileSuccessExifsRGB
ColorProfileSuccessExifAdobeRGB1998
ColorProfileSuccessEmbeddedAdobeRGB1998

Not sure about adding the image type to these.  The stat name includes PNG,
yeah?  /me looking at line 311 diff-right.

         return;
     }
 
     char* profileName;
     int compressionType;
 #if (PNG_LIBPNG_VER < 10500)
     png_charp profile;
 #else
     png_bytep profile;
 #endif
     png_uint_32 profileLength;
-    if (!png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength))
+    if (!png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+        status = ColorProfileNone;

[Noel Gordon, 2015/12/23 15:28:48]

ColorProfileNone -> ColorProfileEmpty

         return;
+    }
 
     // Only accept RGB color profiles from input class devices.
-    bool ignoreProfile = false;
+    ASSERT(status == ColorProfileSuccess);
     char* profileData = reinterpret_cast<char*>(profile);

[Noel Gordon, 2015/12/23 15:28:48]

239-247, same as per the JPEG decoder.  Lump failures in
ColorProfileInvalidContent, remove the version (V4) bit.

     if (profileLength < ImageDecoder::iccColorProfileHeaderLength)
-        ignoreProfile = true;
+        status = ColorProfileIsCorrupted;
+    else if (ImageDecoder::isICCv4(profileData, profileLength))
+        status = ColorProfileIsV4;
     else if (!ImageDecoder::rgbColorProfile(profileData, profileLength))
-        ignoreProfile = true;
+        status = ColorProfileIsNotRGB;
     else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength))
-        ignoreProfile = true;
+        status = ColorProfileIsNotAnInputProfile;
 
-    if (!ignoreProfile)
+    if (status == ColorProfileSuccess)
         colorProfile.append(profileData, profileLength);
 #endif
 }
 #endif
 
 void PNGImageDecoder::headerAvailable()
 {
     png_structp png = m_reader->pngPtr();
     png_infop info = m_reader->infoPtr();
     png_uint_32 width = png_get_image_width(png, info);
@@ skipping 37 matching lines @@
 #if USE(QCMSLIB)
     if ((colorType & PNG_COLOR_MASK_COLOR) && !m_ignoreGammaAndColorProfile) {
         // We only support color profiles for color PALETTE and RGB[A] PNG. Supporting
         // color profiles for gray-scale images is slightly tricky, at least using the
         // CoreGraphics ICC library, because we expand gray-scale images to RGB but we
         // do not similarly transform the color profile. We'd either need to transform
         // the color profile or we'd need to decode into a gray-scale image buffer and
         // hand that to CoreGraphics.
         bool sRGB = false;
         ColorProfile colorProfile;
-        getColorProfile(png, info, colorProfile, sRGB);
+        ColorProfileStatus status = ColorProfileSuccess;
+        getColorProfile(png, info, colorProfile, sRGB, status);
         bool imageHasAlpha = (colorType & PNG_COLOR_MASK_ALPHA) || trnsCount;
-        m_reader->createColorTransform(colorProfile, imageHasAlpha, sRGB);
+        m_reader->createColorTransform(colorProfile, imageHasAlpha, sRGB, &status);
+        Platform::current()->histogramEnumeration("ColorManagement.ColorProfileStatus.PNG", status, ColorProfileStatus::ValueCount);
         m_hasColorProfile = !!m_reader->colorTransform();
     }
 #endif
 
     if (!m_hasColorProfile) {
         // Deal with gamma and keep it under our control.
         const double inverseGamma = 0.45455;
         const double defaultGamma = 2.2;
         double gamma;
         if (!m_ignoreGammaAndColorProfile && png_get_gAMA(png, info, &gamma)) {
@@ skipping 182 matching lines @@
     // has failed.
     if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the PNGImageReader anymore.
     if (isComplete(this) || failed())
         m_reader.clear();
 }
 
 } // namespace blink