diff options
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_child_thread.cc | 9 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector.cc | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index bb69b45..c21b487a 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -180,11 +180,10 @@ void GpuChildThread::StopWatchdog() { } void GpuChildThread::OnCollectGraphicsInfo() { - if (!gpu_info_.finalized && - (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableGpuSandbox) || - CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess) || - CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU))) { + CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kDisableGpuSandbox) || + command_line->ForCurrentProcess()->HasSwitch(switches::kSingleProcess) || + command_line->ForCurrentProcess()->HasSwitch(switches::kInProcessGPU)) { // GPU full info collection should only happen on un-sandboxed GPU process // or single process/in-process gpu mode. diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 86ae2f5..14b1697 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -34,7 +34,7 @@ scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) { scoped_refptr<gfx::GLContext> context( gfx::GLContext::CreateGLContext(NULL, surface, - gfx::PreferDiscreteGpu)); + gfx::PreferIntegratedGpu)); if (!context.get()) { LOG(ERROR) << "gfx::GLContext::CreateGLContext failed"; return NULL; |