Use gfx::ColorSpace instead of SkColorSpace in Blink

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 45 matching lines @@
     return MatrixID::UNKNOWN;
   if (matrix_id > static_cast<int>(MatrixID::LAST_STANDARD_VALUE) &&
       matrix_id < 1000)
     return MatrixID::UNKNOWN;
   return static_cast<MatrixID>(matrix_id);
 }
 
 ColorSpace::ColorSpace() {}
 
 ColorSpace::ColorSpace(PrimaryID primaries,
+                       TransferID transfer)
+    : primaries_(primaries),
+      transfer_(transfer),
+      matrix_(MatrixID::RGB),
+      range_(RangeID::FULL) {}
+
+ColorSpace::ColorSpace(PrimaryID primaries,
                        TransferID transfer,
                        MatrixID matrix,
                        RangeID range)
     : primaries_(primaries),
       transfer_(transfer),
       matrix_(matrix),
       range_(range) {}
 
 ColorSpace::ColorSpace(int primaries, int transfer, int matrix, RangeID range)
     : primaries_(PrimaryIDFromInt(primaries)),
@@ skipping 13 matching lines @@
            sizeof(custom_transfer_params_));
   }
   if (primaries_ == PrimaryID::CUSTOM) {
     memcpy(custom_primary_matrix_, other.custom_primary_matrix_,
            sizeof(custom_primary_matrix_));
   }
 }
 
 ColorSpace::~ColorSpace() = default;
 
+bool ColorSpace::IsValid() const {
+  return (*this != gfx::ColorSpace());
+}
+
 // static
 ColorSpace ColorSpace::CreateSRGB() {
   return ColorSpace(PrimaryID::BT709, TransferID::IEC61966_2_1, MatrixID::RGB,
                     RangeID::FULL);
 }
 
 // static
 ColorSpace ColorSpace::CreateSCRGBLinear() {
   return ColorSpace(PrimaryID::BT709, TransferID::LINEAR_HDR, MatrixID::RGB,
                     RangeID::FULL);
@@ skipping 131 matching lines @@
 
   // Use the parametric transfer function if no other option is available.
   SkColorSpaceTransferFn fn;
   if (!GetTransferFunction(&fn)) {
     DLOG(ERROR) << "Failed to parameterize transfer function for SkColorSpace";
     return nullptr;
   }
   return SkColorSpace::MakeRGB(fn, to_xyz_d50);
 }
 
-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 for
-  // non-ICC-profile based color spaces.
-  ICCProfile icc_profile = ICCProfile::FromSkColorSpace(sk_color_space);
-  return icc_profile.GetColorSpace();
-}
-
 void ColorSpace::GetPrimaryMatrix(SkMatrix44* to_XYZD50) const {
   SkColorSpacePrimaries primaries = {0};
   switch (primaries_) {
     case ColorSpace::PrimaryID::CUSTOM:
       to_XYZD50->set3x3RowMajorf(custom_primary_matrix_);
       return;
 
     case ColorSpace::PrimaryID::RESERVED0:
     case ColorSpace::PrimaryID::RESERVED:
     case ColorSpace::PrimaryID::UNSPECIFIED:
@@ skipping 105 matching lines @@
     case ColorSpace::PrimaryID::XYZ_D50:
       primaries.fRX = 1.0f;
       primaries.fRY = 0.0f;
       primaries.fGX = 0.0f;
       primaries.fGY = 1.0f;
       primaries.fBX = 0.0f;
       primaries.fBY = 0.0f;
       primaries.fWX = 0.34567f;
       primaries.fWY = 0.35850f;
       break;
+
+    case ColorSpace::PrimaryID::ADOBE_RGB:
+      primaries.fRX = 0.6400f;
+      primaries.fRY = 0.3300f;
+      primaries.fGX = 0.2100f;
+      primaries.fGY = 0.7100f;
+      primaries.fBX = 0.1500f;
+      primaries.fBY = 0.0600f;
+      primaries.fWX = 0.3127f;
+      primaries.fWY = 0.3290f;
+      break;
   }
   primaries.toXYZD50(to_XYZD50);
 }
 
 bool ColorSpace::GetTransferFunction(SkColorSpaceTransferFn* fn) const {
   // Default to F(x) = pow(x, 1)
   fn->fA = 1;
   fn->fB = 0;
   fn->fC = 1;
   fn->fD = 0;
@@ skipping 74 matching lines @@
 }
 
 bool ColorSpace::GetInverseTransferFunction(SkColorSpaceTransferFn* fn) const {
   if (!GetTransferFunction(fn))
     return false;
   *fn = InvertTransferFn(*fn);
   return true;
 }
 
 }  // namespace gfx