color: Always use parametric color spaces for raster

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 <sstream>
 
 #include "base/lazy_instance.h"
@@ skipping 416 matching lines @@
     return nullptr;
   }
   if (range_ != RangeID::FULL) {
     DLOG(ERROR) << "Not creating non-full-range SkColorSpace";
     return nullptr;
   }
 
   SkMatrix44 primaries;
   GetPrimaryMatrix(&primaries);
   SkColorSpaceTransferFn tr_fn;
-  bool get_tr_fn_result = GetTransferFunction(&tr_fn);
-  if (!get_tr_fn_result) {
-    DLOG(ERROR) << "Failed to parameterize transfer function for SkColorSpace";
-    CreateSRGB().GetTransferFunction(&tr_fn);
+  if (!GetTransferFunction(&tr_fn)) {
+    DLOG(ERROR) << "Not creating non-parametric nonlinear-blended SkColorSpace";
+    return nullptr;
   }
-  sk_sp<SkColorSpace> result = SkColorSpace::MakeRGB(
-      tr_fn, primaries, SkColorSpace::kNonLinearBlending_ColorSpaceFlag);
-  if (!result) {
-    DLOG(ERROR) << "Failed to create nonlinearly blended SkColorSpace";
-    CreateSRGB().GetTransferFunction(&tr_fn);
-  }
-  return result;
+  return SkColorSpace::MakeRGB(tr_fn, primaries,
+                               SkColorSpace::kNonLinearBlending_ColorSpaceFlag);
 }
 
 bool ColorSpace::GetICCProfile(ICCProfile* icc_profile) const {
   if (!IsValid()) {
     DLOG(ERROR) << "Cannot fetch ICCProfile for invalid space.";
     return false;
   }
   if (matrix_ != MatrixID::RGB) {
     DLOG(ERROR) << "Not creating non-RGB ICCProfile";
     return false;
   }
   if (range_ != RangeID::FULL) {
     DLOG(ERROR) << "Not creating non-full-range ICCProfile";
     return false;
   }
 
   // If this was created from an ICC profile, retrieve that exact profile.
   ICCProfile result;
-  if (ICCProfile::FromId(icc_profile_id_, false, icc_profile))
+  if (ICCProfile::FromId(icc_profile_id_, icc_profile))
     return true;
 
   // Otherwise, construct an ICC profile based on the best approximated
   // primaries and matrix.
   SkMatrix44 to_XYZD50_matrix;
   GetPrimaryMatrix(&to_XYZD50_matrix);
   SkColorSpaceTransferFn fn;
   if (!GetTransferFunction(&fn)) {
     DLOG(ERROR) << "Failed to get ColorSpace transfer function for ICCProfile.";
     return false;
   }
   sk_sp<SkData> data = SkICC::WriteToICC(fn, to_XYZD50_matrix);
   if (!data) {
     DLOG(ERROR) << "Failed to create SkICC.";
     return false;
   }
   *icc_profile = ICCProfile::FromData(data->data(), data->size());
   DCHECK(icc_profile->IsValid());
   return true;
 }
 
 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::INVALID:
+    case ColorSpace::PrimaryID::ICC_BASED:
       to_XYZD50->setIdentity();
       return;
 
     case ColorSpace::PrimaryID::BT709:
       // BT709 is our default case. Put it after the switch just
       // in case we somehow get an id which is not listed in the switch.
       // (We don't want to use "default", because we want the compiler
       //  to tell us if we forgot some enum values.)
       primaries.fRX = 0.640f;
       primaries.fRY = 0.330f;
@@ skipping 185 matching lines @@
       // This could potentially be represented the same as IEC61966_2_1, but
       // it handles negative values differently.
       break;
     case ColorSpace::TransferID::ARIB_STD_B67:
     case ColorSpace::TransferID::BT1361_ECG:
     case ColorSpace::TransferID::LOG:
     case ColorSpace::TransferID::LOG_SQRT:
     case ColorSpace::TransferID::SMPTEST2084:
     case ColorSpace::TransferID::SMPTEST2084_NON_HDR:
     case ColorSpace::TransferID::INVALID:
+    case ColorSpace::TransferID::ICC_BASED:
       break;
   }
 
   return false;
 }
 
 bool ColorSpace::GetInverseTransferFunction(SkColorSpaceTransferFn* fn) const {
   if (!GetTransferFunction(fn))
     return false;
   *fn = SkTransferFnInverse(*fn);
@@ skipping 122 matching lines @@
       matrix->postTranslate(-16.0f/219.0f, -15.5f/224.0f, -15.5f/224.0f);
       break;
   }
 }
 
 std::ostream& operator<<(std::ostream& out, const ColorSpace& color_space) {
   return out << color_space.ToString();
 }
 
 }  // namespace gfx