Make skcms mandatory

Change-Id: I6b08cd586d313e3bc41c0da90698fc26ae1a8bb8
Reviewed-on: https://skia-review.googlesource.com/130822
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/core/SkColorSpace_ICC.cpp b/src/core/SkColorSpace_ICC.cpp
index 88b9dfeb3c..3cc82ed4b6 100644
--- a/src/core/SkColorSpace_ICC.cpp
+++ b/src/core/SkColorSpace_ICC.cpp
@@ -14,12 +14,7 @@
 #include "SkFixed.h"
 #include "SkICCPriv.h"
 #include "SkTemplates.h"
-
-#if defined(SK_USE_SKCMS)
-    bool skcms_can_parse(const void*, size_t);
-#else
-    static bool skcms_can_parse(const void*, size_t) { return true; }
-#endif
+#include "../../third_party/skcms/skcms.h"
 
 #define return_if_false(pred, msg)                                   \
     do {                                                             \
@@ -1489,7 +1484,8 @@ sk_sp<SkColorSpace> SkColorSpace::MakeICC(const void* input, size_t len) {
     }
 
     // Make sure we're at least as strict as skcms_Parse().
-    if (!skcms_can_parse(input, len)) {
+    skcms_ICCProfile p;
+    if (!skcms_Parse(input, len, &p)) {
         return nullptr;
     }