Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 15 insertions, 1 deletions

diff --git a/chrome/common/gpu_info.h b/chrome/common/gpu_info.h
index 3b8e0e6..9593f56 100644
--- a/chrome/common/gpu_info.h
+++ b/chrome/common/gpu_info.h
@@ -24,6 +24,7 @@ class GPUInfo {
 
   enum Level {
     kUninitialized,
+    kPreliminary,
     kPartial,
     kCompleting,
     kComplete,
@@ -50,6 +51,9 @@ class GPUInfo {
   // Return the version of the graphics driver currently installed.
   std::string driver_version() const;
 
+  // Return the date of the graphics driver currently installed.
+  std::string driver_date() const;
+
   // Return the version of the pixel/fragment shader used by the gpu.
   // Major version in the second lowest 8 bits, minor in the lowest 8 bits,
   // eg version 2.5 would be 0x00000205.
@@ -88,6 +92,11 @@ class GPUInfo {
   // semantics are available.
   bool can_lose_context() const;
 
+  // Return true if there was an error at any stage of collecting GPUInfo data.
+  // If there was an error, then the GPUInfo fields may be incomplete or set
+  // to default values such as 0 or empty string.
+  bool collection_error() const;
+
   void SetLevel(Level level);
 
   void SetInitializationTime(const base::TimeDelta& initialization_time);
@@ -95,7 +104,8 @@ class GPUInfo {
   void SetVideoCardInfo(uint32 vendor_id, uint32 device_id);
 
   void SetDriverInfo(const std::string& driver_vendor,
-                     const std::string& driver_version);
+                     const std::string& driver_version,
+                     const std::string& driver_date);
 
   void SetShaderVersion(uint32 pixel_shader_version,
                         uint32 vertex_shader_version);
@@ -112,6 +122,8 @@ class GPUInfo {
 
   void SetCanLoseContext(bool can_lose_context);
 
+  void SetCollectionError(bool collection_error);
+
 #if defined(OS_WIN)
   // The information returned by the DirectX Diagnostics Tool.
   const DxDiagNode& dx_diagnostics() const;
@@ -126,6 +138,7 @@ class GPUInfo {
   uint32 device_id_;
   std::string driver_vendor_;
   std::string driver_version_;
+  std::string driver_date_;
   uint32 pixel_shader_version_;
   uint32 vertex_shader_version_;
   uint32 gl_version_;
@@ -134,6 +147,7 @@ class GPUInfo {
   std::string gl_renderer_;
   std::string gl_extensions_;
   bool can_lose_context_;
+  bool collection_error_;
 
 #if defined(OS_WIN)
   DxDiagNode dx_diagnostics_;