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

Side by Side Diff: ui/gfx/color_space.h

Issue 2271683004: Revert of Support for custom primaries (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_COLOR_SPACE_H_ 5 #ifndef UI_GFX_COLOR_SPACE_H_
6 #define UI_GFX_COLOR_SPACE_H_ 6 #define UI_GFX_COLOR_SPACE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/gtest_prod_util.h"
11 #include "base/macros.h" 10 #include "base/macros.h"
12 #include "build/build_config.h" 11 #include "build/build_config.h"
13 #include "ui/gfx/gfx_export.h" 12 #include "ui/gfx/gfx_export.h"
14 13
15 namespace IPC { 14 namespace IPC {
16 template <class P> 15 template <class P>
17 struct ParamTraits; 16 struct ParamTraits;
18 } // namespace IPC 17 } // namespace IPC
19 18
20 namespace gfx { 19 namespace gfx {
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 bool operator==(const ColorSpace& other) const; 125 bool operator==(const ColorSpace& other) const;
127 bool operator!=(const ColorSpace& other) const; 126 bool operator!=(const ColorSpace& other) const;
128 bool operator<(const ColorSpace& other) const; 127 bool operator<(const ColorSpace& other) const;
129 128
130 private: 129 private:
131 PrimaryID primaries_; 130 PrimaryID primaries_;
132 TransferID transfer_; 131 TransferID transfer_;
133 MatrixID matrix_; 132 MatrixID matrix_;
134 RangeID range_; 133 RangeID range_;
135 134
136 // Only used if primaries_ == PrimaryID::CUSTOM
137 float custom_primary_matrix_[12];
138
139 // This is used to look up the ICCProfile from which this ColorSpace was 135 // This is used to look up the ICCProfile from which this ColorSpace was
140 // created, if possible. 136 // created, if possible.
141 uint64_t icc_profile_id_ = 0; 137 uint64_t icc_profile_id_ = 0;
142 138
143 friend class ICCProfile; 139 friend class ICCProfile;
144 friend class ColorSpaceToColorSpaceTransform; 140 friend class ColorSpaceToColorSpaceTransform;
145 friend struct IPC::ParamTraits<gfx::ColorSpace>; 141 friend struct IPC::ParamTraits<gfx::ColorSpace>;
146 FRIEND_TEST_ALL_PREFIXES(SimpleColorSpace, GetColorSpace);
147 }; 142 };
148 143
149 } // namespace gfx 144 } // namespace gfx
150 145
151 #endif // UI_GFX_COLOR_SPACE_H_ 146 #endif // UI_GFX_COLOR_SPACE_H_
OLDNEW
« 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