Index: gpu/config/gpu_info_collector.cc |
diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc |
index 44df9f1550b2b73ed58c3bc6b994130cbaca8498..471718c398359d4a857559d986baa9010a4f039a 100644 |
--- a/gpu/config/gpu_info_collector.cc |
+++ b/gpu/config/gpu_info_collector.cc |
@@ -176,7 +176,12 @@ void MergeGPUInfoGL(GPUInfo* basic_gpu_info, |
DCHECK(basic_gpu_info); |
// Copy over GPUs because which one is active could change. |
basic_gpu_info->gpu = context_gpu_info.gpu; |
- basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus; |
+ |
+ // TODO(j.isorce): Currently the GPU process does not know about any secondary |
+ // gpu. So for now make sure to keep them when receiving GpuInfo from the GPU |
+ // process through GpuHostMsg_GraphicsInfoCollected. |
+ if (context_gpu_info.secondary_gpus.size() > 0) |
Ken Russell (switch to Gerrit)
2016/04/05 03:31:24
This change is concerning. If it's only needed for
|
+ basic_gpu_info->secondary_gpus = context_gpu_info.secondary_gpus; |
basic_gpu_info->gl_renderer = context_gpu_info.gl_renderer; |
basic_gpu_info->gl_vendor = context_gpu_info.gl_vendor; |