commit 712bb1ecde1aef3cb210f07fcfe6992da50b62e7
author msarett <msarett@google.com> Mon Sep 05 10:33:12 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Sep 05 10:33:12 2016 -0700
tree 8ad9382067fa6a17758404e91ba94c1175cf97e4
parent 008fbd1b8e8339797d0f43164acde6357edb9dc6

Delete kInvalid_GammaNamed (part 2)

We are done using this for UMA.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2306123002

Review-Url: https://codereview.chromium.org/2306123002

include/core/SkColorSpace.h

diff --git a/include/core/SkColorSpace.h b/include/core/SkColorSpace.h
index 5809577..4ab0256 100644
--- a/include/core/SkColorSpace.h
+++ b/include/core/SkColorSpace.h
@@ -45,11 +45,6 @@
          *  exponential curve.  Or the R, G, and B gammas do not match.
          */
         kNonStandard_GammaNamed,
-
-        /**
-         *  To be used by UMA code only.  ICC profiles lacks valid gamma representation.
-         */
-        kInvalid_GammaNamed,
     };
 
     /**

src/core/SkColorSpace_ICC.cpp

diff --git a/src/core/SkColorSpace_ICC.cpp b/src/core/SkColorSpace_ICC.cpp
index 88fd1b3..f819d56 100755
--- a/src/core/SkColorSpace_ICC.cpp
+++ b/src/core/SkColorSpace_ICC.cpp
@@ -594,7 +594,9 @@
 static void handle_invalid_gamma(SkGammas::Type* type, SkGammas::Data* data) {
     if (SkGammas::Type::kNone_Type == *type) {
         *type = SkGammas::Type::kNamed_Type;
-        data->fNamed = SkColorSpace::kInvalid_GammaNamed;
+
+        // Guess sRGB in the case of a malformed transfer function.
+        data->fNamed = SkColorSpace::kSRGB_GammaNamed;
     }
 }
 
@@ -892,7 +894,8 @@
             (*gammas)->fBlueData = bData;
         }
     } else {
-        *gammaNamed = SkColorSpace::kInvalid_GammaNamed;
+        // Guess sRGB if the chunk is missing a transfer function.
+        *gammaNamed = SkColorSpace::kSRGB_GammaNamed;
     }
 
     if (SkColorSpace::kNonStandard_GammaNamed == *gammaNamed) {
@@ -1092,7 +1095,8 @@
                         gammas->fBlueData = bData;
                     }
                 } else {
-                    gammaNamed = kInvalid_GammaNamed;
+                    // Guess sRGB if the profile is missing transfer functions.
+                    gammaNamed = kSRGB_GammaNamed;
                 }
 
                 if (kNonStandard_GammaNamed == gammaNamed) {