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

ui/gfx/color_space.h

 // 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.
 
 #ifndef UI_GFX_COLOR_SPACE_H_
 #define UI_GFX_COLOR_SPACE_H_
 
 #include <stdint.h>
 
 #include "base/gtest_prod_util.h"
@@ skipping 132 matching lines @@
              RangeID full_range);
   ColorSpace(const ColorSpace& other);
   ColorSpace(int primaries, int transfer, int matrix, RangeID full_range);
   ~ColorSpace();
 
   static PrimaryID PrimaryIDFromInt(int primary_id);
   static TransferID TransferIDFromInt(int transfer_id);
   static MatrixID MatrixIDFromInt(int matrix_id);
 
   static ColorSpace CreateSRGB();
-  static ColorSpace CreateCustom(const SkMatrix44& to_XYZD50,
-                                 const SkColorSpaceTransferFn& fn);
   // scRGB is like RGB, but linear and values outside of 0-1 are allowed.
   // scRGB is normally used with fp16 textures.
   static ColorSpace CreateSCRGBLinear();
   static ColorSpace CreateXYZD50();
 
   // TODO: Remove these, and replace with more generic constructors.
   static ColorSpace CreateJpeg();
   static ColorSpace CreateREC601();
   static ColorSpace CreateREC709();
 
   bool operator==(const ColorSpace& other) const;
   bool operator!=(const ColorSpace& other) const;
   bool operator<(const ColorSpace& other) const;
 
   bool IsHDR() const;
 
   // Note that this may return nullptr.
   const sk_sp<SkColorSpace>& ToSkColorSpace() const { return sk_color_space_; }
   static ColorSpace FromSkColorSpace(const sk_sp<SkColorSpace>& sk_color_space);
 
-  void GetPrimaryMatrix(SkMatrix44* to_XYZD50) const;
-  bool GetTransferFunction(SkColorSpaceTransferFn* fn) const;
-  bool GetInverseTransferFunction(SkColorSpaceTransferFn* fn) const;
-
  private:
   PrimaryID primaries_ = PrimaryID::UNSPECIFIED;
   TransferID transfer_ = TransferID::UNSPECIFIED;
   MatrixID matrix_ = MatrixID::UNSPECIFIED;
   RangeID range_ = RangeID::LIMITED;
 
-  // Only used if primaries_ is PrimaryID::CUSTOM.
-  float custom_primary_matrix_[9];
-
-  // Only used if transfer_ is TransferID::CUSTOM. This array consists of the A
-  // through G entries of the SkColorSpaceTransferFn structure in alphabetical
-  // order.
-  float custom_transfer_params_[7];
+  // Only used if primaries_ == PrimaryID::CUSTOM
+  float custom_primary_matrix_[12];
 
   // This is used to look up the ICCProfile from which this ColorSpace was
   // created, if possible.
   uint64_t icc_profile_id_ = 0;
 
   sk_sp<SkColorSpace> sk_color_space_;
 
   friend class ICCProfile;
   friend class ColorSpaceToColorSpaceTransform;
   friend class ColorSpaceWin;
   friend struct IPC::ParamTraits<gfx::ColorSpace>;
   FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_COLOR_SPACE_H_