Display linear-srgb color managed canvas

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 24 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;
 
+// Turn off color correct rendering  by default.
+bool ICCProfile::color_correct_rendering_ = false;
+
 bool ICCProfile::operator==(const ICCProfile& other) const {
   return valid_ == other.valid_ && data_ == other.data_;
 }
 
 // static
 ICCProfile ICCProfile::FromData(const char* data, size_t size) {
   ICCProfile icc_profile;
   if (IsValidProfileLength(size)) {
     icc_profile.valid_ = true;
     icc_profile.data_.insert(icc_profile.data_.begin(), data, data + size);
@@ skipping 17 matching lines @@
 
   // Create a new cached id and add it to the cache.
   icc_profile.id_ = cache.next_unused_id++;
   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() {
+  if (color_correct_rendering_)
+    return gfx::ICCProfile::FromColorSpace(gfx::ColorSpace::CreateSRGB());
   return ICCProfile();
 }
 #endif
 
 // static
 ICCProfile ICCProfile::FromColorSpace(const gfx::ColorSpace& color_space) {
   // Retrieve ICC profiles from the cache.
   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.

[ccameron, 2016/11/11 20:00:44]

This part, doing gfx::ColorSpace->ICCProfile is broken for SRGB color spaces,
and should be fixed.

   return ICCProfile();
 }
 
 const std::vector<char>& ICCProfile::GetData() const {
   return data_;
 }
 
 ColorSpace ICCProfile::GetColorSpace() const {
-  if (!valid_)
+  if (!valid_) {
+    if (color_correct_rendering_)
+      return gfx::ColorSpace::CreateSRGB();
     return gfx::ColorSpace();
+  }
 
   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 47 matching lines @@
   color_space.custom_primary_matrix_[11] = tmp[3].z();
 
   return color_space;
 }
 
 // static
 bool ICCProfile::IsValidProfileLength(size_t length) {
   return length >= kMinProfileLength && length <= kMaxProfileLength;
 }
 
+void ICCProfile::SetColorCorrectRendering(bool color_correct_rendering) {
+  color_correct_rendering_ = color_correct_rendering;
+}
+
 }  // namespace gfx