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

Unified Diff: ui/gfx/color_space.h

Issue 2229953003: Support for custom primaries (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test updated Created 4 years, 4 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 | « cc/quads/largest_draw_quad.cc ('k') | ui/gfx/color_transform.h » ('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 89bb0e898637e9f5a5f04b6ce97c617a2fc8caa7..247e641d7825d6fce38cddee4ad5e5baf91c4e4d 100644
--- a/ui/gfx/color_space.h
+++ b/ui/gfx/color_space.h
@@ -7,6 +7,7 @@
#include <stdint.h>
+#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "build/build_config.h"
#include "ui/gfx/gfx_export.h"
@@ -132,6 +133,9 @@ class GFX_EXPORT ColorSpace {
MatrixID matrix_;
RangeID range_;
+ // 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;
@@ -139,6 +143,7 @@ class GFX_EXPORT ColorSpace {
friend class ICCProfile;
friend class ColorSpaceToColorSpaceTransform;
friend struct IPC::ParamTraits<gfx::ColorSpace>;
+ FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
};
} // namespace gfx
« no previous file with comments | « cc/quads/largest_draw_quad.cc ('k') | ui/gfx/color_transform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698