Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2105)

Unified Diff: content/gpu/gpu_main.cc

Issue 179983006: Don't start the SECCOMP sandbox early for Tegra124 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename flag to gpu-sandbox-start-after-initialization and add option in chrome_restart_request.cc Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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)
« no previous file with comments | « content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698