Add SkColorSpace to gfx::ColorSpace

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"
@@ skipping 56 matching lines @@
   }
 
   Cache& cache = g_cache.Get();
   base::AutoLock lock(cache.lock);
 
   // 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.
   for (auto iter = cache.id_to_icc_profile_mru.begin();
        iter != cache.id_to_icc_profile_mru.end(); ++iter) {
     if (icc_profile.data_ == iter->second.data_) {
-      icc_profile.id_ = iter->second.id_;
+      icc_profile = iter->second;
       cache.id_to_icc_profile_mru.Get(icc_profile.id_);
       return icc_profile;
     }
   }
 
   // Create a new cached id and add it to the cache.
   icc_profile.id_ = cache.next_unused_id++;
+  icc_profile.color_space_ =
+      ColorSpace(ColorSpace::PrimaryID::CUSTOM, ColorSpace::TransferID::CUSTOM,
+                 ColorSpace::MatrixID::RGB, ColorSpace::RangeID::FULL);
+  icc_profile.color_space_.icc_profile_id_ = icc_profile.id_;
+  icc_profile.color_space_.sk_color_space_ = SkColorSpace::MakeICC(data, size);
   cache.id_to_icc_profile_mru.Put(icc_profile.id_, icc_profile);
   return icc_profile;
 }
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_X11)
 // static
 ICCProfile ICCProfile::FromBestMonitor() {
   return ICCProfile();
 }
 #endif
@@ skipping 16 matching lines @@
   }
 
   // TODO(ccameron): Support constructing ICC profiles from arbitrary ColorSpace
   // objects.
   ICCProfile icc_profile;
   icc_profile.type_ = gfx::ICCProfile::Type::FROM_COLOR_SPACE;
   icc_profile.color_space_ = color_space;
   return icc_profile;
 }
 
+ICCProfile ICCProfile::FromSkColorSpace(sk_sp<SkColorSpace> color_space) {
+  ICCProfile icc_profile;
+
+  Cache& cache = g_cache.Get();
+  base::AutoLock lock(cache.lock);
+
+  // 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.
+  for (auto iter = cache.id_to_icc_profile_mru.begin();
+       iter != cache.id_to_icc_profile_mru.end(); ++iter) {
+    sk_sp<SkColorSpace> iter_color_space =
+        iter->second.color_space_.ToSkColorSpace();
+    if (SkColorSpace::Equals(color_space.get(), iter_color_space.get())) {
+      icc_profile = iter->second;
+      cache.id_to_icc_profile_mru.Get(icc_profile.id_);
+      return icc_profile;
+    }
+  }
+
+  // TODO(ccameron): Support constructing ICC profiles from arbitrary
+  // SkColorSpace objects.
+  return icc_profile;
+}
+
 const std::vector<char>& ICCProfile::GetData() const {
   return data_;
 }
 
 ColorSpace ICCProfile::GetColorSpace() const {
   if (type_ == Type::INVALID)
     return gfx::ColorSpace();
   if (type_ == Type::FROM_COLOR_SPACE)
     return color_space_;
 
-  ColorSpace color_space(ColorSpace::PrimaryID::CUSTOM,
-                         ColorSpace::TransferID::CUSTOM,
-                         ColorSpace::MatrixID::RGB, ColorSpace::RangeID::FULL);
-  color_space.icc_profile_id_ = id_;
+  ColorSpace color_space = color_space_;
 
   // Move this ICC profile to the most recently used end of the cache.
   {
     Cache& cache = g_cache.Get();
     base::AutoLock lock(cache.lock);
 
     auto found = cache.id_to_icc_profile_mru.Get(id_);
     if (found == cache.id_to_icc_profile_mru.end())
       cache.id_to_icc_profile_mru.Put(id_, *this);
   }
@@ skipping 43 matching lines @@
 
   return color_space;
 }
 
 // static
 bool ICCProfile::IsValidProfileLength(size_t length) {
   return length >= kMinProfileLength && length <= kMaxProfileLength;
 }
 
 }  // namespace gfx