Add usage metrics for display and image color profiles

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * Portions are Copyright (C) 2001-6 mozilla.org
  *
  * Other contributors:
  *   Stuart Parmenter <stuart@mozilla.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 187 matching lines @@
             unsigned count = readUint32(ifd + 4, isBigEndian);
             if (tag == orientationTag && type == shortType && count == 1)
                 return ImageOrientation::fromEXIFValue(readUint16(ifd + 8, isBigEndian));
         }
     }
 
     return ImageOrientation();
 }
 
 #if USE(QCMSLIB)
-static void readColorProfile(jpeg_decompress_struct* info, ColorProfile& colorProfile)
+static void readColorProfile(jpeg_decompress_struct* info, ColorProfile& colorProfile, ColorProfileStatus& status)
 {
 #if USE(ICCJPEG)
     JOCTET* profile;
     unsigned profileLength;
 
-    if (!read_icc_profile(info, &profile, &profileLength))
+    if (!read_icc_profile(info, &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_ptr<char*>(profile);
     if (profileLength < ImageDecoder::iccColorProfileHeaderLength)
-        ignoreProfile = true;
+        status = ColorProfileIsCorrupted;

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

ColorProfileIsCorrupted -> ColorProfileInvalidContent

+    else if (ImageDecoder::isICCv4(profileData, profileLength))

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

We can remove this, and figure out if we need to record version in another stat.

+        status = ColorProfileIsV4;
     else if (!ImageDecoder::rgbColorProfile(profileData, profileLength))
-        ignoreProfile = true;
+        status = ColorProfileIsNotRGB;

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

ColorProfileIsNotRGB -> ColorProfileInvalidContent

     else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileLength))
-        ignoreProfile = true;
+        status = ColorProfileIsNotAnInputProfile;

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

ColorProfileIsNotAnInputProfile -> ColorProfileInvalidContent

 
     ASSERT(colorProfile.isEmpty());
-    if (!ignoreProfile)
+    if (status == ColorProfileSuccess)
         colorProfile.append(profileData, profileLength);
     free(profile);
 #endif
 }
 #endif
 
 static IntSize computeYUVSize(const jpeg_decompress_struct* info, int component, ImageDecoder::SizeType sizeType)
 {
     if (sizeType == ImageDecoder::SizeForMemoryAllocation) {
         return IntSize(info->cur_comp_info[component]->width_in_blocks * DCTSIZE, info->cur_comp_info[component]->height_in_blocks * DCTSIZE);
@@ skipping 230 matching lines @@
                 overrideColorSpace = JCS_UNKNOWN;
             jpeg_calc_output_dimensions(&m_info);
             m_decoder->setDecodedSize(m_info.output_width, m_info.output_height);
 
             m_decoder->setOrientation(readImageOrientation(info()));
 
 #if USE(QCMSLIB)
             // Allow color management of the decoded RGBA pixels if possible.
             if (!m_decoder->ignoresGammaAndColorProfile()) {
                 ColorProfile colorProfile;
-                readColorProfile(info(), colorProfile);
-                createColorTransform(colorProfile, colorSpaceHasAlpha(m_info.out_color_space));
+                ColorProfileStatus status = ColorProfileSuccess;
+                readColorProfile(info(), colorProfile, status);
+                createColorTransform(colorProfile, colorSpaceHasAlpha(m_info.out_color_space), status);
+                Platform::current()->histogramEnumeration("ColorManagement.ColorProfileStatus.JPEG", status, ColorProfileStatus::ValueCount);
                 if (m_transform) {
                     overrideColorSpace = JCS_UNKNOWN;
 #if defined(TURBO_JPEG_RGB_SWIZZLE)
                     // Input RGBA data to qcms. Note: restored to BGRA on output.
                     if (m_info.out_color_space == JCS_EXT_BGRA)
                         m_info.out_color_space = JCS_EXT_RGBA;
 #endif
                 }
                 m_decoder->setHasColorProfile(!!m_transform);
             }
@@ skipping 137 matching lines @@
 #if USE(QCMSLIB)
     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)
+    void createColorTransform(const ColorProfile& colorProfile, bool hasAlpha, ColorProfileStatus& status)
     {
         clearColorTransform();
 
         if (colorProfile.isEmpty())
+            return; // status should already have a !success code if this is the case
+        qcms_profile* inputProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
+        if (!inputProfile) {
+            status = ColorProfileFailedDecode;

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

ColorProfileFailedDecode -> ColorProfileInvalidContent

             return;
+        }
         qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
         if (!deviceProfile)
             return;
-        qcms_profile* inputProfile = qcms_profile_from_memory(colorProfile.data(), colorProfile.size());
-        if (!inputProfile)
-            return;
         // We currently only support color profiles for RGB profiled 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
 
 private:
@@ skipping 400 matching lines @@
     // has failed.
     if (!m_reader->decode(onlySize) && isAllDataReceived())
         setFailed();
 
     // If decoding is done or failed, we don't need the JPEGImageReader anymore.
     if (isComplete(this, onlySize) || failed())
         m_reader.clear();
 }
 
 }