Add ability to set resolution on external display

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 109 matching lines @@
   }
   virtual void UpdateXRandRConfiguration(
       const base::NativeEvent& event) OVERRIDE { AppendAction(kUpdateXRandR); }
   virtual void GrabServer() OVERRIDE { AppendAction(kGrab); }
   virtual void UngrabServer() OVERRIDE { AppendAction(kUngrab); }
   virtual void SyncWithServer() OVERRIDE { AppendAction(kSync); }
   virtual void SetBackgroundColor(uint32 color_argb) OVERRIDE {
     AppendAction(GetBackgroundAction(color_argb));
   }
   virtual void ForceDPMSOn() OVERRIDE { AppendAction(kForceDPMS); }
-  virtual std::vector<OutputConfigurator::OutputSnapshot> GetOutputs()
-      OVERRIDE {
+  virtual std::vector<OutputConfigurator::OutputSnapshot> GetOutputs(
+      const OutputConfigurator::StateController* controller) OVERRIDE {
     return outputs_;
   }
   virtual bool GetModeDetails(
       RRMode mode,
       int* width,
       int* height,
       bool* interlaced) OVERRIDE {
     std::map<RRMode, ModeDetails>::const_iterator it = modes_.find(mode);
     if (it == modes_.end())
       return false;
@@ skipping 61 matching lines @@
 class TestStateController : public OutputConfigurator::StateController {
  public:
   TestStateController() : state_(STATE_DUAL_EXTENDED) {}
   virtual ~TestStateController() {}
 
   void set_state(OutputState state) { state_ = state; }
 
   // OutputConfigurator::StateController overrides:
   virtual OutputState GetStateForDisplayIds(
       const std::vector<int64>& outputs) const OVERRIDE { return state_; }
+  virtual bool GetResolutionForDisplayId(
+      int64 display_id,
+      int *width,
+      int *height) const OVERRIDE {
+    return false;
+  }
 
  private:
   OutputState state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestStateController);
 };
 
 class TestMirroringController
     : public OutputConfigurator::SoftwareMirroringController {
  public:
@@ skipping 25 matching lines @@
     configurator_.SetDelegateForTesting(
         scoped_ptr<OutputConfigurator::Delegate>(delegate_));
     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->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->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);
@@ skipping 393 matching lines @@
                                 OutputConfigurator::kSetDisplayPowerNoFlags);
   EXPECT_EQ(JoinActions(kGrab, kUngrab, NULL), delegate_->GetActionsAndClear());
   configurator_.SetDisplayPower(DISPLAY_POWER_ALL_ON,
                                 OutputConfigurator::kSetDisplayPowerNoFlags);
   EXPECT_EQ(JoinActions(kGrab, kForceDPMS, kUngrab, NULL),
             delegate_->GetActionsAndClear());
 
   // Connect an external display and check that it's configured correctly.
   outputs_[0].is_internal = false;
   outputs_[0].native_mode = kBigModeId;
+  outputs_[0].selected_mode = kBigModeId;
   UpdateOutputs(1);
   EXPECT_TRUE(test_api_.SendOutputChangeEvents(true));
   EXPECT_EQ(JoinActions(kUpdateXRandR, kGrab,
                         GetFramebufferAction(kBigModeWidth, kBigModeHeight,
                             outputs_[0].crtc, 0).c_str(),
                         GetCrtcAction(outputs_[0].crtc, 0, 0, kBigModeId,
                             outputs_[0].output).c_str(),
                         kUngrab, kProjectingOff, NULL),
             delegate_->GetActionsAndClear());
 }
@@ skipping 54 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