| 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 5c59c10912c4c273fa8af87091622d59a079a01a..9e505f26b5a7631a904b9790dc8c4c717f83b617 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/BitmapImageMetrics.cpp
|
| @@ -35,36 +35,12 @@ void BitmapImageMetrics::countGamma(SkColorSpace* colorSpace)
|
| DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, gammaNamedHistogram, new EnumerationHistogram("Blink.ColorSpace.Destination", GammaEnd));
|
|
|
| if (colorSpace) {
|
| - SkColorSpace::GammaNamed skGamma = colorSpace->gammaNamed();
|
| -
|
| + // TODO (msarett): Add a check for gammaIsLinear() when that API lands in Skia.
|
| Gamma gamma;
|
| - switch (skGamma) {
|
| - case SkColorSpace::kLinear_GammaNamed:
|
| - gamma = GammaLinear;
|
| - break;
|
| - case SkColorSpace::kSRGB_GammaNamed:
|
| + if (colorSpace->gammaCloseToSRGB()) {
|
| gamma = GammaSRGB;
|
| - break;
|
| - case SkColorSpace::k2Dot2Curve_GammaNamed:
|
| - gamma = Gamma2Dot2;
|
| - break;
|
| - default:
|
| - 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;
|
| - }
|
| - break;
|
| + } else {
|
| + gamma = GammaNonStandard;
|
| }
|
|
|
| gammaNamedHistogram.count(gamma);
|
|
|