Add usage metrics for display and image color profiles

third_party/WebKit/Source/platform/image-decoders/webp/WEBPImageDecoder.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 221 matching lines @@
             // where 0 means "infinite". But ImageSource::repetitionCount()
             // returns -1 for "infinite", and 0 and up for "show the image
             // animation one cycle more than the value". Subtract one here
             // to correctly handle the finite and infinite cases.
             --m_repetitionCount;
             // FIXME: Implement ICC profile support for animated images.
             m_formatFlags &= ~ICCP_FLAG;
         }
 
 #if USE(QCMSLIB)
-        if ((m_formatFlags & ICCP_FLAG) && !ignoresGammaAndColorProfile())
-            readColorProfile();
+        if (!ignoresGammaAndColorProfile()) {
+            ColorProfileStatus status;
+            if ((m_formatFlags & ICCP_FLAG)) {
+                status = readColorProfile();
+            } else {
+                status = ColorProfileNone;

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

ColorProfileEmpty

+            }
+            Platform::current()->histogramEnumeration("ColorManagement.ColorProfileStatus.WEBP", status, ColorProfileStatus::ValueCount);
+        }
 #endif
     }
 
     ASSERT(isDecodedSizeAvailable());
     return true;
 }
 
 bool WEBPImageDecoder::initFrameBuffer(size_t frameIndex)
 {
     ImageFrame& buffer = m_frameBufferCache[frameIndex];
@@ skipping 55 matching lines @@
 
 #if USE(QCMSLIB)
 
 void WEBPImageDecoder::clearColorTransform()
 {
     if (m_transform)
         qcms_transform_release(m_transform);
     m_transform = 0;
 }
 
-bool WEBPImageDecoder::createColorTransform(const char* data, size_t size)
+bool WEBPImageDecoder::createColorTransform(const char* data, size_t size, ColorProfileStatus& status)
 {
     clearColorTransform();
 
+    qcms_profile* inputProfile = qcms_profile_from_memory(data, size);
+    if (!inputProfile) {
+        status = ColorProfileFailedDecode;

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

ColorProfileFailedDecode -> ColorProfileInvalidContent

+        return false;
+    }
+
     qcms_profile* deviceProfile = ImageDecoder::qcmsOutputDeviceProfile();
     if (!deviceProfile)
         return false;
-    qcms_profile* inputProfile = qcms_profile_from_memory(data, size);
-    if (!inputProfile)
-        return false;
-
     // We currently only support color profiles for RGB profiled images.
     ASSERT(rgbData == qcms_profile_get_color_space(inputProfile));
     // The input image pixels are RGBA format.
     qcms_data_type format = QCMS_DATA_RGBA_8;
     // FIXME: Don't force perceptual intent if the image profile contains an intent.
     m_transform = qcms_transform_create(inputProfile, format, deviceProfile, QCMS_DATA_RGBA_8, QCMS_INTENT_PERCEPTUAL);
 
     qcms_profile_release(inputProfile);
     return !!m_transform;
 }
 
-void WEBPImageDecoder::readColorProfile()
+ColorProfileStatus WEBPImageDecoder::readColorProfile()
 {
     WebPChunkIterator chunkIterator;
     if (!WebPDemuxGetChunk(m_demux, "ICCP", 1, &chunkIterator)) {
         WebPDemuxReleaseChunkIterator(&chunkIterator);
-        return;
+        return ColorProfileNotFound;

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

ColorProfileNotFound -> ColorProfileEmpty

     }
 
     const char* profileData = reinterpret_cast<const char*>(chunkIterator.chunk.bytes);
     size_t profileSize = chunkIterator.chunk.size;
 
     // Only accept RGB color profiles from input class devices.
-    bool ignoreProfile = false;
+    ColorProfileStatus status = ColorProfileSuccess;

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

362-370, same as per the JPEG decoder.

     if (profileSize < ImageDecoder::iccColorProfileHeaderLength)
-        ignoreProfile = true;
+        status = ColorProfileIsCorrupted;
+    else if (ImageDecoder::isICCv4(profileData, profileSize))
+        status = ColorProfileIsV4;
     else if (!ImageDecoder::rgbColorProfile(profileData, profileSize))
-        ignoreProfile = true;
+        status = ColorProfileIsNotRGB;
     else if (!ImageDecoder::inputDeviceColorProfile(profileData, profileSize))
-        ignoreProfile = true;
+        status = ColorProfileIsNotAnInputProfile;
 
-    if (!ignoreProfile)
-        m_hasColorProfile = createColorTransform(profileData, profileSize);
+    if (status == ColorProfileSuccess)
+        m_hasColorProfile = createColorTransform(profileData, profileSize, status);
 
     WebPDemuxReleaseChunkIterator(&chunkIterator);
+    return status;
 }
 
 #endif // USE(QCMSLIB)
 
 void WEBPImageDecoder::applyPostProcessing(size_t frameIndex)
 {
     ImageFrame& buffer = m_frameBufferCache[frameIndex];
     int width;
     int decodedHeight;
     if (!WebPIDecGetRGB(m_decoder, &decodedHeight, &width, 0, 0))
@@ skipping 176 matching lines @@
             return false;
         }
         // FALLTHROUGH
     default:
         clear();
         return setFailed();
     }
 }
 
 } // namespace blink