Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2203)

Unified Diff: ui/gfx/color_space.h

Issue 2663453002: Revert of Use SkICC in gfx::ICCProfile and gfx::ColorSpace (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/gfx/color_space.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/color_space.h
diff --git a/ui/gfx/color_space.h b/ui/gfx/color_space.h
index d7b2bd97b9e8f7c51ae95365f9bb5fca60d20516..df90dabaff1d773ee594d960b5d246bd692c0487 100644
--- a/ui/gfx/color_space.h
+++ b/ui/gfx/color_space.h
@@ -150,8 +150,6 @@
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();
@@ -172,23 +170,14 @@
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.
« no previous file with comments | « no previous file | ui/gfx/color_space.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698