Add more detail to Dst Color Space UMA

third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp

Index: third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp b/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
index b4af16fc20a641a8c04aa218c04d88fb2b15f540..bee54570a136318c57d8c3a6e1c54b76ca8fc547 100644
--- a/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
+++ b/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
@@ -36,12 +36,34 @@ void BitmapImageMetrics::countGamma(SkColorSpace* colorSpace)
 
     if (colorSpace) {
         SkColorSpace::GammaNamed skGamma = colorSpace->gammaNamed();
-        Gamma gamma =
-            (SkColorSpace::kLinear_GammaNamed == skGamma)      ? GammaLinear :
-            (SkColorSpace::kSRGB_GammaNamed == skGamma)        ? GammaSRGB :
-            (SkColorSpace::k2Dot2Curve_GammaNamed == skGamma)  ? Gamma2Dot2 :
-            (SkColorSpace::kNonStandard_GammaNamed == skGamma) ? GammaNonStandard :
-            GammaFail;
+
+        Gamma gamma;
+        if (SkColorSpace::kLinear_GammaNamed == skGamma) {

[f(malita), 2016/07/27 20:56:44]

Nit: it's a matter a taste (so feel free to ignore:), but I think this would
look less repetitive as a switch statement.

[msarett, 2016/07/27 21:05:17]

Yes agreed!  I think that looks better.

+            gamma = GammaLinear;
+        } else if (SkColorSpace::kSRGB_GammaNamed == skGamma) {
+            gamma = GammaSRGB;
+        } else if (SkColorSpace::k2Dot2Curve_GammaNamed == skGamma) {
+            gamma = Gamma2Dot2;
+        } else if (SkColorSpace::kInvalid_GammaNamed == skGamma) {

[f(malita), 2016/07/27 20:46:42]

Does this depend on a Skia CL? I can't find SkColorSpace::kInvalid_GammaNamed
locally.

+            gamma = GammaInvalid;
+        } else {
+            if (colorSpace->gammasAreMatching()) {
+                if (colorSpace->gammasAreValues()) {
+                    gamma = GammaExponent;
+                } else if (colorSpace->gammasAreParams()) {
+                    gamma = GammaParametric;
+                } else if (colorSpace->gammasAreTables()) {
+                    gamma = GammaTable;
+                } else if (colorSpace->gammasAreNamed()) {
+                    gamma = GammaNamed;
+                } else {
+                    gamma = GammaFail;
+                }
+            } else {
+                gamma = GammaNonStandard;
+            }
+        }
+
         gammaNamedHistogram.count(gamma);
     } else {
         gammaNamedHistogram.count(GammaNull);