| Index: chrome/gpu/gpu_info_collector_mac.mm
|
| ===================================================================
|
| --- chrome/gpu/gpu_info_collector_mac.mm (revision 75345)
|
| +++ chrome/gpu/gpu_info_collector_mac.mm (working copy)
|
| @@ -52,12 +52,21 @@
|
| return CollectGraphicsInfoGL(gpu_info);
|
| }
|
|
|
| +bool CollectGraphicsInfoSafe(GPUInfo* gpu_info) {
|
| + DCHECK(gpu_info);
|
| +
|
| + gpu_info->SetLevel(GPUInfo::kPartial);
|
| +
|
| + bool rt = true;
|
| + if (!CollectVideoCardInfo(gpu_info))
|
| + rt = false;
|
| +
|
| + return rt;
|
| +}
|
| +
|
| bool CollectVideoCardInfo(GPUInfo* gpu_info) {
|
| DCHECK(gpu_info);
|
|
|
| - if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL)
|
| - return false;
|
| -
|
| UInt32 vendor_id = 0, device_id = 0;
|
| io_registry_entry_t dsp_port = CGDisplayIOServicePort(kCGDirectMainDisplay);
|
| CFTypeRef vendor_id_ref = SearchPortForProperty(dsp_port, CFSTR("vendor-id"));
|
|
|