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 8491508667d467822926dd89134fa02a7bd4ba48..f55c738d469e0cda162cfa57f1a592f9d4577653 100644 |
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc |
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc |
@@ -556,13 +556,20 @@ void GpuDataManagerImplPrivate::GetGLStrings(std::string* gl_vendor, |
void GpuDataManagerImplPrivate::Initialize() { |
TRACE_EVENT0("startup", "GpuDataManagerImpl::Initialize"); |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- if (command_line->HasSwitch(switches::kSkipGpuDataLoading) && |
- !command_line->HasSwitch(switches::kUseGpuInTests)) |
- return; |
+ const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
gpu::GPUInfo gpu_info; |
- { |
+ if (command_line->GetSwitchValueASCII( |
+ switches::kUseGL) == gfx::kGLImplementationOSMesaName) { |
+ // If using the OSMesa GL implementation, report fake vendor and device |
+ // names. |
+ gpu_info.gpu.vendor_string = gfx::kGLImplementationOSMesaName; |
Zhenyao Mo
2013/08/16 16:59:01
Actually you don't have to fake these data. The o
gab
2013/08/16 17:04:46
Ah ok, good to know, why is that? (it's not clear
gab
2013/08/16 19:42:16
Done.
|
+ gpu_info.gpu.device_string = gfx::kGLImplementationOSMesaName; |
+ gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName; |
+ gpu_info.driver_date = "8-16-2013"; |
+ gpu_info.gl_vendor = gfx::kGLImplementationOSMesaName; |
+ gpu_info.gl_renderer = gfx::kGLImplementationOSMesaName; |
+ } else { |
TRACE_EVENT0("startup", |
"GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo"); |
gpu::CollectBasicGraphicsInfo(&gpu_info); |