Chromium Code Reviews| Index: content/gpu/gpu_main.cc |
| diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc |
| index 8176221343fddde1afb908558dd203b0990e669b..5c751cf5f5bfc619a04003a953c58a5ff0212ea0 100644 |
| --- a/content/gpu/gpu_main.cc |
| +++ b/content/gpu/gpu_main.cc |
| @@ -208,11 +208,14 @@ int GpuMain(const MainFunctionParams& parameters) { |
| bool initialized_gl_context = false; |
| bool should_initialize_gl_context = false; |
| #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) |
| - // On Chrome OS ARM, GPU driver userspace creates threads when initializing |
| - // a GL context, so start the sandbox early. |
| - gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), |
| - should_initialize_gl_context); |
| - initialized_sandbox = true; |
| + // On Chrome OS ARM Mali, GPU driver userspace creates threads when |
| + // initializing a GL context, so start the sandbox early. |
| + if (!command_line.HasSwitch( |
| + switches::kGpuSandboxStartAfterInitialization)) { |
|
Jorge Lucangeli Obes
2014/03/26 17:15:11
I think the correct indentation here is four space
davidung
2014/03/26 22:19:14
ugh, it's 5 spaces after running 'clang-format'
|
| + gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), |
| + should_initialize_gl_context); |
| + initialized_sandbox = true; |
| + } |
| #endif |
| #endif // defined(OS_LINUX) |