Add bits to indicate which parts of GPUInfo are collected.

gpu/config/gpu_info.h

 // Copyright (c) 2012 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.
 
 #ifndef GPU_CONFIG_GPU_INFO_H_
 #define GPU_CONFIG_GPU_INFO_H_
 
 // Provides access to the GPU information for the system
 // on which chrome is currently running.
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/time/time.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "gpu/config/dx_diag_node.h"
 #include "gpu/config/gpu_performance_stats.h"
 #include "gpu/gpu_export.h"
 
 namespace gpu {
 
+// Result for the various Collect*Info* functions below.
+// Fatal failures are for cases where we can't create a context at all or
+// something, making the use of the GPU impossible.
+// Non-fatal failures are for cases where we could gather most info, but maybe
+// some is missing (e.g. unable to parse a version string or to detect the exact
+// model).
+enum CollectInfoResult {
+  kCollectInfoNone = 0,
+  kCollectInfoSuccess = 1,
+  kCollectInfoNonFatalFailure = 2,
+  kCollectInfoFatalFailure = 3

[Ken Russell (switch to Gerrit), 2014/09/03 22:22:00]

Something to consider for a follow-on CL: perhaps this enum could contain ranges
of fatal and non-fatal failures and there could be an API for categorizing a
particular code. I wonder whether the current statuses will provide enough
information to track down exactly what part of GPU info collection failed.

+};
+
 struct GPU_EXPORT GPUInfo {
   struct GPU_EXPORT GPUDevice {
     GPUDevice();
     ~GPUDevice();
 
     // The DWORD (uint32) representing the graphics card vendor id.
     uint32 vendor_id;
 
     // The DWORD (uint32) representing the graphics card device id.
     // Device ids are unique to vendor, not to one another.
@@ skipping 11 matching lines @@
     std::string device_string;
   };
 
   GPUInfo();
   ~GPUInfo();
 
   bool SupportsAccelerated2dCanvas() const {
     return !can_lose_context && !software_rendering;
   }
 
-  // Whether more GPUInfo fields might be collected in the future.
-  bool finalized;
-
   // The amount of time taken to get from the process starting to the message
   // loop being pumped.
   base::TimeDelta initialization_time;
 
   // Computer has NVIDIA Optimus
   bool optimus;
 
   // Computer has AMD Dynamic Switchable Graphics
   bool amd_switchable;
 
@@ skipping 81 matching lines @@
   // Whether the driver uses direct rendering. True on most platforms, false on
   // X11 when using remote X.
   bool direct_rendering;
 
   // Whether the gpu process is running in a sandbox.
   bool sandboxed;
 
   // Number of GPU process crashes recorded.
   int process_crash_count;
 
+  // The state of whether the basic/context/DxDiagnostics info is collected and
+  // if the collection fails or not.
+  CollectInfoResult basic_info_state;
+  CollectInfoResult context_info_state;
 #if defined(OS_WIN)
+  CollectInfoResult dx_diagnostics_info_state;
+
   // The information returned by the DirectX Diagnostics Tool.
   DxDiagNode dx_diagnostics;
 #endif
   // Note: when adding new members, please remember to update EnumerateFields
   // in gpu_info.cc.
 
   // In conjunction with EnumerateFields, this allows the embedder to
   // enumerate the values in this structure without having to embed
   // references to its specific member variables. This simplifies the
   // addition of new fields to this type.
@@ skipping 23 matching lines @@
     virtual ~Enumerator() {}
   };
 
   // Outputs the fields in this structure to the provided enumerator.
   void EnumerateFields(Enumerator* enumerator) const;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_INFO_H_