Revert of Read compositor VSync information from platform, when possible

ash/display/display_info.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 <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/size_f.h"
 
 #if defined(OS_WIN)
 #include "ui/aura/window_tree_host.h"
 #include "ui/gfx/win/dpi.h"
 #endif
 
 namespace ash {
 namespace internal {
 
-DisplayMode::DisplayMode()
-    : refresh_rate(0.0f), interlaced(false), native(false) {}
-
-DisplayMode::DisplayMode(const gfx::Size& size,
-                         float refresh_rate,
-                         bool interlaced,
-                         bool native)
+Resolution::Resolution(const gfx::Size& size, bool interlaced)
     : size(size),
-      refresh_rate(refresh_rate),
-      interlaced(interlaced),
-      native(native) {}
+      interlaced(interlaced) {
+}
 
 // satic
 DisplayInfo DisplayInfo::CreateFromSpec(const std::string& spec) {
   return CreateFromSpecWithID(spec, gfx::Display::kInvalidDisplayID);
 }
 
 // static
 DisplayInfo DisplayInfo::CreateFromSpecWithID(const std::string& spec,
                                               int64 id) {
   // Default bounds for a display.
@@ skipping 57 matching lines @@
              &device_scale_factor) >= 4) {
     bounds_in_native.SetRect(x, y, width, height);
   } else {
 #if defined(OS_WIN)
     if (gfx::IsHighDPIEnabled()) {
       device_scale_factor = gfx::GetModernUIScale();
     }
 #endif
   }
 
-  std::vector<DisplayMode> display_modes;
+  std::vector<Resolution> resolutions;
   if (Tokenize(main_spec, "#", &parts) == 2) {
-    size_t native_mode = 0;
-    int largest_area = -1;
-    float highest_refresh_rate = -1.0f;
     main_spec = parts[0];
     std::string resolution_list = parts[1];
     count = Tokenize(resolution_list, "|", &parts);
     for (size_t i = 0; i < count; ++i) {
       std::string resolution = parts[i];
       int width, height;
-      float refresh_rate = 0.0f;
-      if (sscanf(resolution.c_str(),
-                 "%dx%d%%%f",
-                 &width,
-                 &height,
-                 &refresh_rate) >= 2) {
-        if (width * height >= largest_area &&
-            refresh_rate > highest_refresh_rate) {
-          // Use mode with largest area and highest refresh rate as native.
-          largest_area = width * height;
-          highest_refresh_rate = refresh_rate;
-          native_mode = i;
-        }
-        display_modes.push_back(
-            DisplayMode(gfx::Size(width, height), refresh_rate, false, false));
-      }
+      if (sscanf(resolution.c_str(), "%dx%d", &width, &height) == 2)
+        resolutions.push_back(Resolution(gfx::Size(width, height), false));
     }
-    display_modes[native_mode].native = true;
   }
 
   if (id == gfx::Display::kInvalidDisplayID)
     id = synthesized_display_id++;
   DisplayInfo display_info(
       id, base::StringPrintf("Display-%d", static_cast<int>(id)), has_overscan);
   display_info.set_device_scale_factor(device_scale_factor);
   display_info.set_rotation(rotation);
   display_info.set_configured_ui_scale(ui_scale);
   display_info.SetBounds(bounds_in_native);
-  display_info.set_display_modes(display_modes);
+  display_info.set_resolutions(resolutions);
 
   // To test the overscan, it creates the default 5% overscan.
   if (has_overscan) {
     int width = bounds_in_native.width() / device_scale_factor / 40;
     int height = bounds_in_native.height() / device_scale_factor / 40;
     display_info.SetOverscanInsets(gfx::Insets(height, width, height, width));
     display_info.UpdateDisplaySize();
   }
 
   DVLOG(1) << "DisplayInfoFromSpec info=" << display_info.ToString()
@@ skipping 31 matching lines @@
 
 void DisplayInfo::Copy(const DisplayInfo& native_info) {
   DCHECK(id_ == native_info.id_);
   name_ = native_info.name_;
   has_overscan_ = native_info.has_overscan_;
 
   DCHECK(!native_info.bounds_in_native_.IsEmpty());
   bounds_in_native_ = native_info.bounds_in_native_;
   size_in_pixel_ = native_info.size_in_pixel_;
   device_scale_factor_ = native_info.device_scale_factor_;
-  display_modes_ = native_info.display_modes_;
+  resolutions_ = native_info.resolutions_;
   touch_support_ = native_info.touch_support_;
 
   // Copy overscan_insets_in_dip_ if it's not empty. This is for test
   // cases which use "/o" annotation which sets the overscan inset
   // to native, and that overscan has to be propagated. This does not
   // happen on the real environment.
   if (!native_info.overscan_insets_in_dip_.empty())
     overscan_insets_in_dip_ = native_info.overscan_insets_in_dip_;
 
   // Rotation_ and ui_scale_ are given by preference, or unit
@@ skipping 51 matching lines @@
   return base::StringPrintf(
       "DisplayInfo[%lld] native bounds=%s, size=%s, scale=%f, "
       "overscan=%s, rotation=%d, ui-scale=%f, touchscreen=%s",
       static_cast<long long int>(id_),
       bounds_in_native_.ToString().c_str(),
       size_in_pixel_.ToString().c_str(),
       device_scale_factor_,
       overscan_insets_in_dip_.ToString().c_str(),
       rotation_degree,
       configured_ui_scale_,
-      touch_support_ == gfx::Display::TOUCH_SUPPORT_AVAILABLE
-          ? "yes"
-          : touch_support_ == gfx::Display::TOUCH_SUPPORT_UNAVAILABLE
-                ? "no"
-                : "unknown");
+      touch_support_ == gfx::Display::TOUCH_SUPPORT_AVAILABLE ? "yes" :
+      touch_support_ == gfx::Display::TOUCH_SUPPORT_UNAVAILABLE ? "no" :
+      "unknown");
 }
 
 std::string DisplayInfo::ToFullString() const {
-  std::string display_modes_str;
-  std::vector<DisplayMode>::const_iterator iter = display_modes_.begin();
-  for (; iter != display_modes_.end(); ++iter) {
-    if (!display_modes_str.empty())
-      display_modes_str += ",";
-    base::StringAppendF(&display_modes_str,
-                        "(%dx%d@%f%c%s)",
-                        iter->size.width(),
-                        iter->size.height(),
-                        iter->refresh_rate,
-                        iter->interlaced ? 'I' : 'P',
-                        iter->native ? "(N)" : "");
+  std::string resolutions_str;
+  std::vector<Resolution>::const_iterator iter = resolutions_.begin();
+  for (; iter != resolutions_.end(); ++iter) {
+    if (!resolutions_str.empty())
+      resolutions_str += ",";
+    resolutions_str += iter->size.ToString();
+    if (iter->interlaced)
+      resolutions_str += "(i)";
   }
-  return ToString() + ", display_modes==" + display_modes_str;
+  return ToString() + ", resolutions=" + resolutions_str;
 }
 
 }  // namespace internal
 }  // namespace ash