Use SkICC in gfx::ICCProfile and gfx::ColorSpace

ui/gfx/color_transform.cc

 // Copyright (c) 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/color_transform.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 147 matching lines @@
   SkMatrix44 matrix;
   primaries.toXYZD50(&matrix);
   return Transform(matrix);
 }
 
 GFX_EXPORT float FromLinear(ColorSpace::TransferID id, float v) {
   switch (id) {
     case ColorSpace::TransferID::SMPTEST2084_NON_HDR:
       // Should already be handled.
       NOTREACHED();
     case ColorSpace::TransferID::CUSTOM:

[hubbe, 2017/01/22 04:30:30]

Maybe implement this? (And also in ToLinear?)

[ccameron, 2017/01/23 18:58:58]

Good point.

I started trying to put this in this patch, but it starts to pull in a bunch of
parts of tests, and the patch snowballs a bit, so I'd prefer to put it in a
separate one.

WRT ToLinear, yes, definitely needs to be done. I'd like to put this in a
separate patch for the same testing reasons, and also because it involves a bit
of being careful with numerics (making sure I translate everything correctly),
so I'd like to keep that out of the bigger refactor patch.

[ccameron, 2017/01/25 07:09:44]

Went ahead and did this.

     // TODO(hubbe): Actually implement custom transfer functions.
     case ColorSpace::TransferID::RESERVED0:
     case ColorSpace::TransferID::RESERVED:
     case ColorSpace::TransferID::UNSPECIFIED:
     case ColorSpace::TransferID::UNKNOWN:
     // All unknown values default to BT709
 
     case ColorSpace::TransferID::BT709:
     case ColorSpace::TransferID::SMPTE170M:
     case ColorSpace::TransferID::BT2020_10:
@@ skipping 673 matching lines @@
 
  private:
   bool disable_optimizations_ = false;
   std::vector<std::unique_ptr<ColorTransformInternal>> transforms_;
 };
 
 class ColorSpaceToColorSpaceTransform {
  public:
   static Transform GetPrimaryTransform(const ColorSpace& c) {
     if (c.primaries_ == ColorSpace::PrimaryID::CUSTOM) {
-      return Transform(c.custom_primary_matrix_[0], c.custom_primary_matrix_[1],
-                       c.custom_primary_matrix_[2], c.custom_primary_matrix_[3],
-                       c.custom_primary_matrix_[4], c.custom_primary_matrix_[5],
-                       c.custom_primary_matrix_[6], c.custom_primary_matrix_[7],
-                       c.custom_primary_matrix_[8], c.custom_primary_matrix_[9],
-                       c.custom_primary_matrix_[10],
-                       c.custom_primary_matrix_[11], 0.0f, 0.0f, 0.0f, 1.0f);
+      SkMatrix44 sk_matrix;
+      c.GetPrimaryMatrix(&sk_matrix);
+      return Transform(sk_matrix);
     } else {
       return GetPrimaryMatrix(c.primaries_);
     }
   }
 
   static void ColorSpaceToColorSpace(ColorSpace from,
                                      ColorSpace to,
                                      ColorTransform::Intent intent,
                                      TransformBuilder* builder) {
     if (intent == ColorTransform::Intent::INTENT_PERCEPTUAL) {
@@ skipping 143 matching lines @@
       to_profile ? ColorSpace::CreateXYZD50() : to, intent, &builder);
   if (to_profile) {
     builder.Append(std::unique_ptr<ColorTransformInternal>(
         new QCMSColorTransform(GetXYZD50Profile(), to_profile)));
   }
 
   return builder.GetTransform();
 }
 
 }  // namespace gfx