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

Unified Diff: content/gpu/gpu_main.cc

Issue 10534049: Disable the seccomp filter GPU process sandbox by default on Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Correct alignment of '=' sign for cmdline flag. Created 8 years, 6 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
« no previous file with comments | « content/common/sandbox_init_linux.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_main.cc
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 27caaa0bbdadb780813b0e71778b1279816180ce..d1c4a76e212b36a7ee8436a5b24209400d02bad9 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -139,10 +139,20 @@ int GpuMain(const content::MainFunctionParams& parameters) {
(void) ret;
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX)
{
TRACE_EVENT0("gpu", "Initialize sandbox");
- content::InitializeSandbox();
+ bool do_init_sandbox = true;
+
+#if defined(OS_CHROMEOS) && defined(NDEBUG)
+ // On Chrome OS and when not on a debug build, initialize
+ // the GPU process' sandbox only for Intel GPUs.
+ do_init_sandbox = gpu_info.gpu.vendor_id == 0x8086; // Intel GPU.
+#endif
+
+ if (do_init_sandbox) {
+ content::InitializeSandbox();
+ }
}
#endif
« no previous file with comments | « content/common/sandbox_init_linux.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698