2 files changed, 13 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index b31f3931bb..5488ed86d1 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1629,6 +1629,7 @@ if (skia_enable_tools) {
         ":gpu_tool_utils",
         ":skia",
         ":tests",
+        ":third_party_skcms",
         ":tool_utils",
         "//third_party/jsoncpp",
         "//third_party/libpng",
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 52826ac00b..6378fabd3a 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -71,6 +71,10 @@
     #include "SkXMLWriter.h"
 #endif
 
+#if defined(SK_USE_SKCMS)
+    #include "skcms.h"
+#endif
+
 #if SK_SUPPORT_GPU
 #include "GrBackendSurface.h"
 #include "GrContextPriv.h"
@@ -1084,7 +1088,14 @@ Error ColorCodecSrc::draw(SkCanvas* canvas) const {
     if (kDst_sRGB_Mode == fMode) {
         dstSpace = SkColorSpace::MakeSRGB();
     } else if (kDst_HPZR30w_Mode == fMode) {
-        dstSpace = SkColorSpace::MakeICC(dstData->data(), dstData->size());
+#if defined(SK_USE_SKCMS)
+        skcms_ICCProfile profile;
+        SkAssertResult(skcms_Parse(dstData->data(), dstData->size(), &profile));
+        dstSpace = SkColorSpace::Make(profile);
+        SkASSERT(dstSpace);
+#else
+        return "Cannot use ICC profile without skcms support.";
+#endif
     }
 
     SkImageInfo decodeInfo = codec->getInfo().makeColorType(fColorType).makeColorSpace(dstSpace);