color: Use SkColorSpaceXform instead of QCMS for LUTs

ui/gfx/icc_profile.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/icc_profile.h"
 
 #include <list>
 
 #include "base/containers/mru_cache.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
+#include "third_party/skia/include/core/SkColorSpaceXform.h"
 #include "third_party/skia/include/core/SkICC.h"
 #include "ui/gfx/color_transform.h"
 #include "ui/gfx/skia_color_space_util.h"
 
 namespace gfx {
 
 const uint64_t ICCProfile::test_id_adobe_rgb_ = 1;
 const uint64_t ICCProfile::test_id_color_spin_ = 2;
 const uint64_t ICCProfile::test_id_generic_rgb_ = 3;
 const uint64_t ICCProfile::test_id_srgb_ = 4;
@@ skipping 42 matching lines @@
 
 // static
 ICCProfile ICCProfile::FromData(const void* data, size_t size) {
   return FromDataWithId(data, size, 0);
 }
 
 // static
 ICCProfile ICCProfile::FromDataWithId(const void* data,
                                       size_t size,
                                       uint64_t new_profile_id) {
-  if (!size) {
-    DLOG(ERROR) << "Invalid empty ICC profile.";
+  if (!size)
     return ICCProfile();
-  }
 
   const char* data_as_char = reinterpret_cast<const char*>(data);
   {
     // Linearly search the cached ICC profiles to find one with the same data.
     // If it exists, re-use its id and touch it in the cache.
     Cache& cache = g_cache.Get();
     base::AutoLock lock(cache.lock);
     for (auto iter = cache.id_to_icc_profile_mru.begin();
          iter != cache.id_to_icc_profile_mru.end(); ++iter) {
       const std::vector<char>& iter_data = iter->second.data_;
@@ skipping 81 matching lines @@
     auto found = cache.id_to_icc_profile_mru.Get(id_);
     if (found != cache.id_to_icc_profile_mru.end()) {
       color_space_ = found->second.color_space_;
       parametric_color_space_ = found->second.parametric_color_space_;
       successfully_parsed_by_sk_icc_ =
           found->second.successfully_parsed_by_sk_icc_;
       return;
     }
   }
 
+  // Parse the profile and attempt to create a SkColorSpaceXform out of it.
+  sk_sp<SkColorSpace> sk_srgb_color_space = SkColorSpace::MakeSRGB();
   sk_sp<SkICC> sk_icc = SkICC::Make(data_.data(), data_.size());
-  if (sk_icc) {
+  sk_sp<SkColorSpace> sk_icc_color_space;
+  std::unique_ptr<SkColorSpaceXform> sk_color_space_xform;
+  if (sk_icc)
+    sk_icc_color_space = SkColorSpace::MakeICC(data_.data(), data_.size());
+  if (sk_icc_color_space) {
+    sk_color_space_xform = SkColorSpaceXform::New(sk_srgb_color_space.get(),
+                                                  sk_icc_color_space.get());
+  }
+
+  // Attempt to extract a parametric represetation for this space.
+  if (sk_color_space_xform) {
     bool parametric_color_space_is_accurate = false;
     successfully_parsed_by_sk_icc_ = true;
 
     // Populate |parametric_color_space_| as a primary matrix and analytic
     // transfer function, if possible.
     SkMatrix44 to_XYZD50_matrix;
     if (sk_icc->toXYZD50(&to_XYZD50_matrix)) {
       SkColorSpaceTransferFn fn;
       // First try to get a numerical transfer function from the profile.
       if (sk_icc->isNumericalTransferFn(&fn)) {
@@ skipping 28 matching lines @@
     // If the approximation is accurate, then set |parametric_color_space_| and
     // |color_space_| to the same value, and link them to |this|. Otherwise, set
     // them separately, and do not link |parametric_color_space_| to |this|.
     if (parametric_color_space_is_accurate) {
       parametric_color_space_.icc_profile_id_ = id_;
       color_space_ = parametric_color_space_;
     } else {
       color_space_ = ColorSpace(ColorSpace::PrimaryID::ICC_BASED,
                                 ColorSpace::TransferID::ICC_BASED);
       color_space_.icc_profile_id_ = id_;
-      color_space_.icc_profile_sk_color_space_ =
-          SkColorSpace::MakeICC(data_.data(), data_.size());
+      color_space_.icc_profile_sk_color_space_ = sk_icc_color_space;
     }
+  } else if (sk_icc_color_space) {
+    DLOG(ERROR) << "Parsed ICCProfile, but unable to create an "
+                   "SkColorSpaceXform from it.";
+    successfully_parsed_by_sk_icc_ = false;
   } else {
-    DLOG(ERROR) << "Unable parse ICCProfile.";
+    DLOG(ERROR) << "Unable to parse ICCProfile.";
     successfully_parsed_by_sk_icc_ = false;
   }
 
   // Add to the cache.
   {
     Cache& cache = g_cache.Get();
     base::AutoLock lock(cache.lock);
     cache.id_to_icc_profile_mru.Put(id_, *this);
   }
 }
 
 }  // namespace gfx