Add SkColorSpace to gfx::ColorSpace

ui/gfx/color_space.cc

 // Copyright (c) 2012 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/color_space.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
@@ skipping 47 matching lines @@
 
 ColorSpace::ColorSpace(int primaries, int transfer, int matrix, RangeID range)
     : primaries_(PrimaryIDFromInt(primaries)),
       transfer_(TransferIDFromInt(transfer)),
       matrix_(MatrixIDFromInt(matrix)),
       range_(range) {
   memset(custom_primary_matrix_, 0, sizeof(custom_primary_matrix_));
   // TODO: Set profile_id_
 }
 
+ColorSpace::ColorSpace(const ColorSpace& other)
+    : primaries_(other.primaries_),
+      transfer_(other.transfer_),
+      matrix_(other.matrix_),
+      range_(other.range_),
+      icc_profile_id_(other.icc_profile_id_),
+      sk_color_space_(other.sk_color_space_) {
+  memcpy(custom_primary_matrix_, other.custom_primary_matrix_,
+         sizeof(custom_primary_matrix_));
+}
+
+ColorSpace::~ColorSpace() = default;
+
 // static
 ColorSpace ColorSpace::CreateSRGB() {
-  return ColorSpace(PrimaryID::BT709, TransferID::IEC61966_2_1, MatrixID::RGB,
+  ColorSpace result(PrimaryID::BT709, TransferID::IEC61966_2_1, MatrixID::RGB,
                     RangeID::FULL);
+  result.sk_color_space_ = SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
+  return result;
 }
 
 // Static
 ColorSpace ColorSpace::CreateXYZD50() {
   return ColorSpace(PrimaryID::XYZ_D50, TransferID::LINEAR, MatrixID::RGB,
                     RangeID::FULL);
 }
 
 // static
 ColorSpace ColorSpace::CreateJpeg() {
@@ skipping 51 matching lines @@
                sizeof(custom_primary_matrix_));
     if (primary_result < 0)
       return true;
     if (primary_result > 0)
       return false;
   }
   return false;
 }
 
 sk_sp<SkColorSpace> ColorSpace::ToSkColorSpace() const {
-  // Unspecified color spaces are represented as nullptr SkColorSpaces.
-  if (*this == gfx::ColorSpace())
-    return nullptr;
-  if (*this == gfx::ColorSpace::CreateSRGB())
-    return SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named);
-
-  // TODO(crbug.com/634102): Support more than just ICC profile based color
-  // spaces. The DCHECK here is to ensure that callers that expect a valid
-  // result are notified of this incomplete functionality.
-  std::vector<char> icc_data = gfx::ICCProfile::FromColorSpace(*this).GetData();
-  sk_sp<SkColorSpace> result =
-      SkColorSpace::MakeICC(icc_data.data(), icc_data.size());
-  DCHECK(result);
-  return result;
+  return sk_color_space_;
 }
 
 ColorSpace ColorSpace::FromSkColorSpace(
     const sk_sp<SkColorSpace>& sk_color_space) {
   if (!sk_color_space)
     return gfx::ColorSpace();
   if (SkColorSpace::Equals(
           sk_color_space.get(),
           SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named).get()))
     return gfx::ColorSpace::CreateSRGB();
 
-  // TODO(crbug.com/634102): Add conversion to gfx::ColorSpace.
-  return gfx::ColorSpace();
+  // TODO(crbug.com/634102): Add conversion to gfx::ColorSpace for
+  // non-ICC-profile based color spaces.
+  ICCProfile icc_profile = ICCProfile::FromSkColorSpace(sk_color_space);
+  return icc_profile.GetColorSpace();
 }
 
 }  // namespace gfx