Revert of Read compositor VSync information from platform, when possible

ash/display/display_change_observer_chromeos.cc

 // Copyright 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 "ash/display/display_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 19 matching lines @@
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 const unsigned int kHighDensityDPIThreshold = 160;
 
 // 1 inch in mm.
 const float kInchInMm = 25.4f;
 
-// Display mode list is sorted by (in descending priority):
-//  * the area in pixels.
-//  * refresh rate.
-struct DisplayModeSorter {
-  bool operator()(const DisplayMode& a, const DisplayMode& b) {
-    if (a.size.GetArea() == b.size.GetArea())
-      return (a.refresh_rate > b.refresh_rate);
-    return (a.size.GetArea() > b.size.GetArea());
+// Resolution list are sorted by the area in pixels and the larger
+// one comes first.
+struct ResolutionSorter {
+  bool operator()(const Resolution& a, const Resolution& b) {
+    return a.size.width() * a.size.height() > b.size.width() * b.size.height();
   }
 };
 
 }  // namespace
 
 // static
-std::vector<DisplayMode> DisplayChangeObserver::GetDisplayModeList(
+std::vector<Resolution> DisplayChangeObserver::GetResolutionList(
     const OutputConfigurator::OutputSnapshot& output) {
-  typedef std::map<std::pair<int, int>, DisplayMode> DisplayModeMap;
-  DisplayModeMap display_mode_map;
+  typedef std::map<std::pair<int,int>, Resolution> ResolutionMap;
+  ResolutionMap resolution_map;
 
   for (std::map<RRMode, OutputConfigurator::ModeInfo>::const_iterator it =
        output.mode_infos.begin(); it != output.mode_infos.end(); ++it) {
     const OutputConfigurator::ModeInfo& mode_info = it->second;
     const std::pair<int, int> size(mode_info.width, mode_info.height);
-    const DisplayMode display_mode(gfx::Size(mode_info.width, mode_info.height),
-                                   mode_info.refresh_rate,
-                                   mode_info.interlaced,
-                                   output.native_mode == it->first);
+    const Resolution resolution(gfx::Size(mode_info.width, mode_info.height),
+                                mode_info.interlaced);
 
-    // Add the display mode if it isn't already present and override interlaced
-    // display modes with non-interlaced ones.
-    DisplayModeMap::iterator display_mode_it = display_mode_map.find(size);
-    if (display_mode_it == display_mode_map.end())
-      display_mode_map.insert(std::make_pair(size, display_mode));
-    else if (display_mode_it->second.interlaced && !display_mode.interlaced)
-      display_mode_it->second = display_mode;
+    // Add the resolution if it isn't already present and override interlaced
+    // resolutions with non-interlaced ones.
+    ResolutionMap::iterator resolution_it = resolution_map.find(size);
+    if (resolution_it == resolution_map.end())
+      resolution_map.insert(std::make_pair(size, resolution));
+    else if (resolution_it->second.interlaced && !resolution.interlaced)
+      resolution_it->second = resolution;
   }
 
-  std::vector<DisplayMode> display_mode_list;
-  for (DisplayModeMap::const_iterator iter = display_mode_map.begin();
-       iter != display_mode_map.end();
+  std::vector<Resolution> resolution_list;
+  for (ResolutionMap::const_iterator iter = resolution_map.begin();
+       iter != resolution_map.end();
        ++iter) {
-    display_mode_list.push_back(iter->second);
+    resolution_list.push_back(iter->second);
   }
-  std::sort(
-      display_mode_list.begin(), display_mode_list.end(), DisplayModeSorter());
-  return display_mode_list;
+  std::sort(resolution_list.begin(), resolution_list.end(), ResolutionSorter());
+  return resolution_list;
 }
 
 DisplayChangeObserver::DisplayChangeObserver() {
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 DisplayChangeObserver::~DisplayChangeObserver() {
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 chromeos::OutputState DisplayChangeObserver::GetStateForDisplayIds(
     const std::vector<int64>& display_ids) const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshForceMirrorMode)) {
     return chromeos::STATE_DUAL_MIRROR;
   }
 
   CHECK_EQ(2U, display_ids.size());
   DisplayIdPair pair = std::make_pair(display_ids[0], display_ids[1]);
   DisplayLayout layout = Shell::GetInstance()->display_manager()->
       layout_store()->GetRegisteredDisplayLayout(pair);
   return layout.mirrored ?
       chromeos::STATE_DUAL_MIRROR : chromeos::STATE_DUAL_EXTENDED;
 }
 
 bool DisplayChangeObserver::GetResolutionForDisplayId(int64 display_id,
                                                       int* width,
                                                       int* height) const {
-  DisplayMode mode;
-  if (!Shell::GetInstance()->display_manager()->GetSelectedModeForDisplayId(
-           display_id, &mode))
+  gfx::Size resolution;
+  if (!Shell::GetInstance()->display_manager()->
+      GetSelectedResolutionForDisplayId(display_id, &resolution)) {
     return false;
+  }
 
-  *width = mode.size.width();
-  *height = mode.size.height();
+  *width = resolution.width();
+  *height = resolution.height();
   return true;
 }
 
 void DisplayChangeObserver::OnDisplayModeChanged(
     const std::vector<OutputConfigurator::OutputSnapshot>& outputs) {
   std::vector<DisplayInfo> displays;
   std::set<int64> ids;
   for (size_t i = 0; i < outputs.size(); ++i) {
     const OutputConfigurator::OutputSnapshot& output = outputs[i];
 
@@ skipping 12 matching lines @@
 
     float device_scale_factor = 1.0f;
     if (!ui::IsXDisplaySizeBlackListed(output.width_mm, output.height_mm) &&
         (kInchInMm * mode_info->width / output.width_mm) >
         kHighDensityDPIThreshold) {
       device_scale_factor = 2.0f;
     }
     gfx::Rect display_bounds(
         output.x, output.y, mode_info->width, mode_info->height);
 
-    std::vector<DisplayMode> display_modes = GetDisplayModeList(output);
+    std::vector<Resolution> resolutions;
+    if (output.type != chromeos::OUTPUT_TYPE_INTERNAL)
+      resolutions = GetResolutionList(output);
 
     std::string name = output.type == chromeos::OUTPUT_TYPE_INTERNAL ?
         l10n_util::GetStringUTF8(IDS_ASH_INTERNAL_DISPLAY_NAME) :
         chromeos::GetDisplayName(output.output);
     if (name.empty())
       name = l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_UNKNOWN_DISPLAY_NAME);
 
     bool has_overscan = false;
     chromeos::GetOutputOverscanFlag(output.output, &has_overscan);
 
     int64 id = output.display_id;
     if (id == gfx::Display::kInvalidDisplayID || ids.find(id) != ids.end())
       id = output.index;
     ids.insert(id);
 
     displays.push_back(DisplayInfo(id, name, has_overscan));
     displays.back().set_device_scale_factor(device_scale_factor);
     displays.back().SetBounds(display_bounds);
     displays.back().set_native(true);
-    displays.back().set_display_modes(display_modes);
+    displays.back().set_resolutions(resolutions);
     displays.back().set_touch_support(
         output.touch_device_id == 0 ? gfx::Display::TOUCH_SUPPORT_UNAVAILABLE :
                                       gfx::Display::TOUCH_SUPPORT_AVAILABLE);
   }
 
   // DisplayManager can be null during the boot.
   Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 void DisplayChangeObserver::OnAppTerminating() {
 #if defined(USE_ASH)
   // Stop handling display configuration events once the shutdown
   // process starts. crbug.com/177014.
   Shell::GetInstance()->output_configurator()->Stop();
 #endif
 }
 
 }  // namespace internal
 }  // namespace ash