Add bits to indicate which parts of GPUInfo are collected.

gpu/config/gpu_info_collector_mac.mm

 // 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.
 
 #include "gpu/config/gpu_info_collector.h"
 
 #include <vector>
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 44 matching lines @@
 // Find the info of the current GPU.
 GPUInfo::GPUDevice GetActiveGPU() {
   GPUInfo::GPUDevice gpu;
   io_registry_entry_t dsp_port = CGDisplayIOServicePort(kCGDirectMainDisplay);
   gpu.vendor_id = GetEntryProperty(dsp_port, CFSTR("vendor-id"));
   gpu.device_id = GetEntryProperty(dsp_port, CFSTR("device-id"));
   return gpu;
 }
 
 // Scan IO registry for PCI video cards.
-bool CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
+CollectInfoResult CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
   GPUInfo::GPUDevice active_gpu = GetActiveGPU();
 
   // Collect all GPUs' info.
   // match_dictionary will be consumed by IOServiceGetMatchingServices, no need
   // to release it.
   CFMutableDictionaryRef match_dictionary = IOServiceMatching("IOPCIDevice");
   io_iterator_t entry_iterator;
   std::vector<GPUInfo::GPUDevice> gpu_list;
   if (IOServiceGetMatchingServices(kIOMasterPortDefault,
@@ skipping 14 matching lines @@
           gpu.active = true;
         }
         gpu_list.push_back(gpu);
       }
     }
     IOObjectRelease(entry_iterator);
   }
 
   switch (gpu_list.size()) {
     case 0:
-      return false;
+      return kCollectInfoNonFatalFailure;
     case 1:
       gpu_info->gpu = gpu_list[0];
       break;
     case 2:
       {
         int integrated = -1;
         int discrete = -1;
         if (gpu_list[0].vendor_id == kVendorIDIntel)
           integrated = 0;
         else if (gpu_list[1].vendor_id == kVendorIDIntel)
@@ skipping 36 matching lines @@
         }
         for (size_t i = 0; i < gpu_list.size(); ++i) {
           if (i == current)
             gpu_info->gpu = gpu_list[i];
           else
             gpu_info->secondary_gpus.push_back(gpu_list[i]);
         }
       }
       break;
   }
-  return (gpu_info->gpu.vendor_id && gpu_info->gpu.device_id);
+  if (gpu_info->gpu.vendor_id == 0 || gpu_info->gpu.device_id == 0)
+    return kCollectInfoNonFatalFailure;
+  return kCollectInfoSuccess;
 }
 
 }  // namespace anonymous
 
 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
 
   gpu_info->can_lose_context =
       (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
-  gpu_info->finalized = true;
-  return CollectGraphicsInfoGL(gpu_info);
+  CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
+  gpu_info->context_info_state = result;
+  return result;
 }
 
-GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
+CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
   DCHECK(vendor_id && device_id);
 
   GPUInfo::GPUDevice gpu = GetActiveGPU();
   *vendor_id = gpu.vendor_id;
   *device_id = gpu.device_id;
 
   if (*vendor_id != 0 && *device_id != 0)
-    return kGpuIDSuccess;
-  return kGpuIDFailure;
+    return kCollectInfoSuccess;
+  return kCollectInfoNonFatalFailure;
 }
 
 CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   int32 model_major = 0, model_minor = 0;
   base::mac::ParseModelIdentifier(base::mac::GetModelIdentifier(),
                                   &gpu_info->machine_model_name,
                                   &model_major, &model_minor);
   gpu_info->machine_model_version =
       base::IntToString(model_major) + "." + base::IntToString(model_minor);
 
-  bool result = CollectPCIVideoCardInfo(gpu_info);
-  return result ? kCollectInfoSuccess : kCollectInfoNonFatalFailure;
+  CollectInfoResult result = CollectPCIVideoCardInfo(gpu_info);
+  gpu_info->basic_info_state = result;
+  return result;
 }
 
 CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   // Extract the OpenGL driver version string from the GL_VERSION string.
   // Mac OpenGL drivers have the driver version
   // at the end of the gl version string preceded by a dash.
   // Use some jiggery-pokery to turn that utf8 string into a std::wstring.
   size_t pos = gpu_info->gl_version.find_last_of('-');
   if (pos == std::string::npos)
     return kCollectInfoNonFatalFailure;
   gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1);
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu