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 {
 
-Resolution::Resolution(const gfx::Size& size, bool interlaced)
-    : size(size),
-      interlaced(interlaced) {
-}
+Resolution::Resolution() : refresh_rate(0.0f), interlaced(false) {}
+
+Resolution::Resolution(const gfx::Size& size,
+                       float refresh_rate,
+                       bool interlaced)
+    : size(size), refresh_rate(refresh_rate), 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 65 matching lines @@
   }
 
   std::vector<Resolution> resolutions;
   if (Tokenize(main_spec, "#", &parts) == 2) {
     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;
-      if (sscanf(resolution.c_str(), "%dx%d", &width, &height) == 2)
-        resolutions.push_back(Resolution(gfx::Size(width, height), false));
+      float refresh_rate = 0.0f;
+      if (sscanf(resolution.c_str(),
+                 "%dx%d%%%f",
+                 &width,
+                 &height,
+                 &refresh_rate) >= 2)
+        resolutions.push_back(
+            Resolution(gfx::Size(width, height), refresh_rate, false));
     }
   }
 
   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);
@@ skipping 105 matching lines @@
 void DisplayInfo::SetOverscanInsets(const gfx::Insets& insets_in_dip) {
   overscan_insets_in_dip_ = insets_in_dip;
 }
 
 gfx::Insets DisplayInfo::GetOverscanInsetsInPixel() const {
   return overscan_insets_in_dip_.Scale(device_scale_factor_);
 }
 
 std::string DisplayInfo::ToString() const {
   int rotation_degree = static_cast<int>(rotation_) * 90;
+  std::string resolutions;
+  std::vector<Resolution>::const_iterator iter;
+  for (iter = resolutions_.begin(); iter != resolutions_.end(); ++iter) {
+    base::StringAppendF(&resolutions,
+                        "(%dx%d@%f%c), ",
+                        iter->size.width(),
+                        iter->size.height(),
+                        iter->refresh_rate,
+                        iter->interlaced ? 'I' : 'P');
+  }
   return base::StringPrintf(
       "DisplayInfo[%lld] native bounds=%s, size=%s, scale=%f, "
-      "overscan=%s, rotation=%d, ui-scale=%f, touchscreen=%s",
+      "overscan=%s, rotation=%d, ui-scale=%f, touchscreen=%s, resolutions=[%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",
+      resolutions.c_str());
 }
 
 std::string DisplayInfo::ToFullString() const {
   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() + ", resolutions=" + resolutions_str;
 }
 
 }  // namespace internal
 }  // namespace ash