chromeos: Make OutputConfigurator save latest config.

chromeos/display/output_configurator_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/display/output_configurator.h"
 
 #include <cstdarg>
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 130 matching lines @@
       return false;
 
     if (width)
       *width = it->second.width;
     if (height)
       *height = it->second.height;
     if (interlaced)
       *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,
       const OutputConfigurator::CoordinateTransformation& ctm) OVERRIDE {
     AppendAction(GetCTMAction(touch_device_id, ctm));
   }
   virtual void SendProjectingStateToPowerManager(bool projecting) OVERRIDE {
     AppendAction(projecting ? kProjectingOn : kProjectingOff);
   }
 
@@ skipping 82 matching lines @@
     configurator_.set_state_controller(&state_controller_);
     configurator_.set_mirroring_controller(&mirroring_controller_);
 
     OutputConfigurator::OutputSnapshot* o = &outputs_[0];
     o->output = 1;
     o->crtc = 10;
     o->current_mode = kSmallModeId;
     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;
     o->has_display_id = true;
 
     o = &outputs_[1];
     o->output = 2;
     o->crtc = 11;
     o->current_mode = kBigModeId;
     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;
     o->has_display_id = true;
 
     UpdateOutputs(2);
     delegate_->AddMode(kSmallModeId, kSmallModeWidth, kSmallModeHeight, false);
     delegate_->AddMode(kBigModeId, kBigModeWidth, kBigModeHeight, false);
   }
 
@@ skipping 465 matching lines @@
   test_api_.SendOutputChangeEvents(true);
   EXPECT_EQ(STATE_DUAL_EXTENDED, configurator_.output_state());
 
   outputs_[0].has_display_id = true;
   UpdateOutputs(2);
   test_api_.SendOutputChangeEvents(true);
   EXPECT_EQ(STATE_DUAL_MIRROR, configurator_.output_state());
 }
 
 }  // namespace chromeos