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

Unified Diff: chromeos/display/output_configurator_unittest.cc

Issue 22605008: chromeos: Make OutputConfigurator save latest config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix interpretation of XRRSetCrtcConfig return value Created 7 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 | « chromeos/display/output_configurator.cc ('k') | chromeos/display/real_output_configurator_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/display/output_configurator_unittest.cc
diff --git a/chromeos/display/output_configurator_unittest.cc b/chromeos/display/output_configurator_unittest.cc
index 246a436f3be8064349ebd6598be27eee0d01979b..96386f547fe64715a45c4cf8ded6f5e206d161b4 100644
--- a/chromeos/display/output_configurator_unittest.cc
+++ b/chromeos/display/output_configurator_unittest.cc
@@ -148,19 +148,23 @@ class TestDelegate : public OutputConfigurator::Delegate {
*interlaced = it->second.interlaced;
return true;
}
- virtual void ConfigureCrtc(OutputConfigurator::CrtcConfig* config) OVERRIDE {
- AppendAction(GetCrtcAction(config->crtc, config->x, config->y, config->mode,
- config->output));
+ virtual bool ConfigureCrtc(RRCrtc crtc,
+ RRMode mode,
+ RROutput output,
+ int x,
+ int y) OVERRIDE {
+ AppendAction(GetCrtcAction(crtc, x, y, mode, output));
+ return true;
}
virtual void CreateFrameBuffer(
int width,
int height,
- const std::vector<OutputConfigurator::CrtcConfig>& configs) OVERRIDE {
+ const std::vector<OutputConfigurator::OutputSnapshot>& outputs) OVERRIDE {
AppendAction(
GetFramebufferAction(width,
height,
- configs.size() >= 1 ? configs[0].crtc : 0,
- configs.size() >= 2 ? configs[1].crtc : 0));
+ outputs.size() >= 1 ? outputs[0].crtc : 0,
+ outputs.size() >= 2 ? outputs[1].crtc : 0));
}
virtual void ConfigureCTM(
int touch_device_id,
@@ -263,8 +267,8 @@ class OutputConfiguratorTest : public testing::Test {
o->native_mode = kSmallModeId;
o->selected_mode = kSmallModeId;
o->mirror_mode = kSmallModeId;
+ o->x = 0;
o->y = 0;
- o->height = kSmallModeHeight;
o->is_internal = true;
o->is_aspect_preserving_scaling = true;
o->touch_device_id = 0;
@@ -277,8 +281,8 @@ class OutputConfiguratorTest : public testing::Test {
o->native_mode = kBigModeId;
o->selected_mode = kBigModeId;
o->mirror_mode = kSmallModeId;
+ o->x = 0;
o->y = 0;
- o->height = kBigModeHeight;
o->is_internal = false;
o->is_aspect_preserving_scaling = true;
o->touch_device_id = 0;
« no previous file with comments | « chromeos/display/output_configurator.cc ('k') | chromeos/display/real_output_configurator_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698