Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6177)

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 2729103004: gpu/config: remove CollectGpuID (Closed)
Patch Set: Fix Mac warning Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/config/gpu_info_collector.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 3d51dcd4270061060b0bb4edc7fec039dc6142a3..4a34cfe4b7d4580e7aaa3f364b42bec20540426e 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -241,9 +241,10 @@ void DisplayReconfigCallback(CGDirectDisplayID display,
bool gpu_changed = false;
if (flags & kCGDisplayAddFlag) {
- uint32_t vendor_id, device_id;
- if (gpu::CollectGpuID(&vendor_id, &device_id) == gpu::kCollectInfoSuccess) {
- gpu_changed = manager->UpdateActiveGpu(vendor_id, device_id);
+ gpu::GPUInfo gpu_info;
+ if (gpu::CollectBasicGraphicsInfo(&gpu_info) == gpu::kCollectInfoSuccess) {
+ gpu_changed = manager->UpdateActiveGpu(gpu_info.gpu.vendor_id,
+ gpu_info.gpu.device_id);
ccameron 2017/05/12 23:46:10 For dual-GPU macs, gpu_info.gpu always refers to t
}
}
« no previous file with comments | « no previous file | gpu/config/gpu_info_collector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698