Chromium Code Reviews| 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..f112e5e60a7f660e632d69f492ada0d528d50237 100644 |
| --- a/content/browser/gpu/gpu_data_manager_impl_private.cc |
| +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc |
| @@ -556,10 +556,6 @@ 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; |
| gpu::GPUInfo gpu_info; |
| { |
|
Zhenyao Mo
2013/08/15 21:53:42
Here you should check if kUseGL is "osmesa" (I thi
gab
2013/08/16 16:37:08
Ok done, although I couldn't really find a good va
|
| @@ -575,6 +571,7 @@ void GpuDataManagerImplPrivate::Initialize() { |
| std::string gpu_blacklist_string; |
| std::string gpu_switching_list_string; |
| std::string gpu_driver_bug_list_string; |
| + const CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| if (!command_line->HasSwitch(switches::kIgnoreGpuBlacklist) && |
| !command_line->HasSwitch(switches::kUseGpuInTests)) { |
| gpu_blacklist_string = gpu::kSoftwareRenderingListJson; |