diff options
author | robert.bradford <robert.bradford@intel.com> | 2015-11-05 07:51:31 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-05 15:52:21 +0000 |
commit | 5b1a23541fa0f96ea5c13df556e8661bbea85903 (patch) | |
tree | 1d78ef8632b31fb22fc56d56768be2b6485b46f1 /ui | |
parent | 7a2c6b09316b1fa695fac516c428e8bff068173f (diff) | |
download | chromium_src-5b1a23541fa0f96ea5c13df556e8661bbea85903.zip chromium_src-5b1a23541fa0f96ea5c13df556e8661bbea85903.tar.gz chromium_src-5b1a23541fa0f96ea5c13df556e8661bbea85903.tar.bz2 |
ash: Add unit testing coverage of DisplayColorManager
As part of the effort to enable more advanced display color management this CL
introduces testing of the existing VCGT support.
The .icc files included here were copied from ChromeOS:
http://crrev.com/48950c9cb35671c59f9f63316683357c8792b79d
BUG=495196
TEST=ash_unittests:DisplayColorManagerTest
Review URL: https://codereview.chromium.org/1430633003
Cr-Commit-Position: refs/heads/master@{#358061}
Diffstat (limited to 'ui')
-rw-r--r-- | ui/display/chromeos/test/test_display_snapshot.cc | 5 | ||||
-rw-r--r-- | ui/display/chromeos/test/test_display_snapshot.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ui/display/chromeos/test/test_display_snapshot.cc b/ui/display/chromeos/test/test_display_snapshot.cc index 227e6f4..41da246 100644 --- a/ui/display/chromeos/test/test_display_snapshot.cc +++ b/ui/display/chromeos/test/test_display_snapshot.cc @@ -23,6 +23,7 @@ TestDisplaySnapshot::TestDisplaySnapshot( const gfx::Size& physical_size, DisplayConnectionType type, bool is_aspect_preserving_scaling, + int64_t product_id, const std::vector<const DisplayMode*>& modes, const DisplayMode* current_mode, const DisplayMode* native_mode) @@ -35,7 +36,9 @@ TestDisplaySnapshot::TestDisplaySnapshot( std::string(), modes, current_mode, - native_mode) {} + native_mode) { + product_id_ = product_id; +} TestDisplaySnapshot::~TestDisplaySnapshot() {} diff --git a/ui/display/chromeos/test/test_display_snapshot.h b/ui/display/chromeos/test/test_display_snapshot.h index b5b5cac..77bdc84 100644 --- a/ui/display/chromeos/test/test_display_snapshot.h +++ b/ui/display/chromeos/test/test_display_snapshot.h @@ -18,6 +18,7 @@ class DISPLAY_EXPORT TestDisplaySnapshot : public DisplaySnapshot { const gfx::Size& physical_size, DisplayConnectionType type, bool is_aspect_preserving_scaling, + int64_t product_id, const std::vector<const DisplayMode*>& modes, const DisplayMode* current_mode, const DisplayMode* native_mode); |