Add ability to set resolution on external display

chromeos/display/real_output_configurator_delegate.cc

 // Copyright (c) 2013 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/real_output_configurator_delegate.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 #include <X11/extensions/XInput.h>
@@ skipping 87 matching lines @@
   XChangeWindowAttributes(display_, window_, CWBackPixel, &swa);
   XFreeColors(display_, colormap, &color.pixel, 1, 0);
 }
 
 void RealOutputConfiguratorDelegate::ForceDPMSOn() {
   CHECK(DPMSEnable(display_));
   CHECK(DPMSForceLevel(display_, DPMSModeOn));
 }
 
 std::vector<OutputConfigurator::OutputSnapshot>
-RealOutputConfiguratorDelegate::GetOutputs() {
+RealOutputConfiguratorDelegate::GetOutputs(
+    const OutputConfigurator::StateController* state_controller) {
   CHECK(screen_) << "Server not grabbed";
 
   std::vector<OutputConfigurator::OutputSnapshot> outputs;
   XRROutputInfo* one_info = NULL;
   XRROutputInfo* two_info = NULL;
   RRCrtc last_used_crtc = None;
 
   for (int i = 0; i < screen_->noutput && outputs.size() < 2; ++i) {
     RROutput this_id = screen_->outputs[i];
     XRROutputInfo* output_info = XRRGetOutputInfo(display_, screen_, this_id);
@@ skipping 24 matching lines @@
       }
 
       // Assign a CRTC that isn't already in use.
       for (int j = 0; j < output_info->ncrtc; ++j) {
         if (output_info->crtcs[j] != last_used_crtc) {
           to_populate.crtc = output_info->crtcs[j];
           last_used_crtc = to_populate.crtc;
           break;
         }
       }
+      to_populate.native_mode = GetOutputNativeMode(output_info);
+      if (to_populate.has_display_id) {
+        int width = 0, height = 0;
+        if (state_controller &&
+            state_controller->GetResolutionForDisplayId(
+                to_populate.display_id, &width, &height)) {
+          to_populate.selected_mode =
+              FindOutputModeMatchingSize(screen_, output_info, width, height);
+        }
+      }
+      // Fallback to native mode.
+      if (to_populate.selected_mode == None)
+        to_populate.selected_mode = to_populate.native_mode;
 
-      to_populate.native_mode = GetOutputNativeMode(output_info);
       to_populate.is_aspect_preserving_scaling =
           IsOutputAspectPreservingScaling(this_id);
       to_populate.touch_device_id = None;
 
       VLOG(2) << "Found display " << outputs.size() << ":"
               << " output=" << to_populate.output
               << " crtc=" << to_populate.crtc
               << " current_mode=" << to_populate.current_mode;
       outputs.push_back(to_populate);
     } else {
@@ skipping 406 matching lines @@
           << " id " << info[i].deviceid
           << " width " << width
           << " height " << height;
     }
   }
 
   XIFreeDeviceInfo(info);
 }
 
 }  // namespace chromeos