Add more robust gfx::ColorSpace<->gfx::ICCProfile conversion

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 25 matching lines @@
 }  // namespace
 
 ICCProfile::ICCProfile() = default;
 ICCProfile::ICCProfile(ICCProfile&& other) = default;
 ICCProfile::ICCProfile(const ICCProfile& other) = default;
 ICCProfile& ICCProfile::operator=(ICCProfile&& other) = default;
 ICCProfile& ICCProfile::operator=(const ICCProfile& other) = default;
 ICCProfile::~ICCProfile() = default;
 
 bool ICCProfile::operator==(const ICCProfile& other) const {
-  return valid_ == other.valid_ && data_ == other.data_;
+  if (type_ != other.type_)
+    return false;
+  switch (type_) {
+    case Type::INVALID:
+      return true;
+    case Type::FROM_COLOR_SPACE:
+      return color_space_ == other.color_space_;
+    case Type::FROM_DATA:
+      return data_ == other.data_;
+  }
+  return false;
 }
 
 // static
 ICCProfile ICCProfile::FromData(const char* data, size_t size) {
   ICCProfile icc_profile;
   if (IsValidProfileLength(size)) {
-    icc_profile.valid_ = true;
+    icc_profile.type_ = Type::FROM_DATA;
     icc_profile.data_.insert(icc_profile.data_.begin(), data, data + size);
+  } else {
+    return ICCProfile();
   }
-  if (!icc_profile.valid_)
-    return 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) {
     if (icc_profile.data_ == iter->second.data_) {
       icc_profile.id_ = iter->second.id_;
@@ skipping 10 matching lines @@
 
 #if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_X11)
 // static
 ICCProfile ICCProfile::FromBestMonitor() {
   return ICCProfile();
 }
 #endif
 
 // static
 ICCProfile ICCProfile::FromColorSpace(const gfx::ColorSpace& color_space) {
-  // Retrieve ICC profiles from the cache.
+  if (color_space == gfx::ColorSpace())
+    return ICCProfile();
+
+  // If |color_space| was created from an ICC profile, retrieve that exact
+  // profile.
   if (color_space.icc_profile_id_) {
     Cache& cache = g_cache.Get();
     base::AutoLock lock(cache.lock);
 
     auto found = cache.id_to_icc_profile_mru.Get(color_space.icc_profile_id_);
     if (found != cache.id_to_icc_profile_mru.end()) {
       return found->second;
     }
   }
+
   // TODO(ccameron): Support constructing ICC profiles from arbitrary ColorSpace
   // objects.
-  return ICCProfile();
+  ICCProfile icc_profile;
+  icc_profile.type_ = gfx::ICCProfile::Type::FROM_COLOR_SPACE;
+  icc_profile.color_space_ = color_space;
+  return icc_profile;
 }
 
 const std::vector<char>& ICCProfile::GetData() const {
   return data_;
 }
 
 ColorSpace ICCProfile::GetColorSpace() const {
-  if (!valid_)
+  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_;
 
   // Move this ICC profile to the most recently used end of the cache.
   {
     Cache& cache = g_cache.Get();
     base::AutoLock lock(cache.lock);
@@ skipping 48 matching lines @@
 
   return color_space;
 }
 
 // static
 bool ICCProfile::IsValidProfileLength(size_t length) {
   return length >= kMinProfileLength && length <= kMaxProfileLength;
 }
 
 }  // namespace gfx