Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 89a52819615fd28c247037e4dcaed06f40c0ba24..ab045e4fadab4008f4545ea6fdd1aaaadb4dded4 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -959,7 +959,6 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
bool established_gpu_channel = false; |
#if defined(USE_AURA) || defined(OS_ANDROID) |
established_gpu_channel = |
no sievers
2014/03/29 20:50:19
Should be initialized to |true| I think.
danakj
2014/03/31 14:40:43
Oh, yah, thanks.
|
- !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) || |
parsed_command_line_.HasSwitch(switches::kSingleProcess) || |
parsed_command_line_.HasSwitch(switches::kInProcessGPU); |
#if defined(USE_AURA) |
@@ -1032,7 +1031,6 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) && |
!established_gpu_channel && |
always_uses_gpu && |
- !parsed_command_line_.HasSwitch(switches::kDisableGpuProcessPrelaunch) && |
!parsed_command_line_.HasSwitch(switches::kSingleProcess) && |
!parsed_command_line_.HasSwitch(switches::kInProcessGPU)) { |
TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process", |