summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:55:28 +0000
committerjorgelo@chromium.org <jorgelo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 20:55:28 +0000
commit7af21438b0bf8a00ba8b34050108d311189534b6 (patch)
treec6e412e1f7c943911338733627276d413bc10cb0 /content
parent6ab69392d1bfade6c1dce8da102378113cd62d76 (diff)
downloadchromium_src-7af21438b0bf8a00ba8b34050108d311189534b6.zip
chromium_src-7af21438b0bf8a00ba8b34050108d311189534b6.tar.gz
chromium_src-7af21438b0bf8a00ba8b34050108d311189534b6.tar.bz2
Disable Chrome OS seccomp filter GPU sandbox.
The seccomp filter sandbox for the GPU process is causing crashes on Chrome OS. Disable it until we develop a more robust implementation. BUG=127491 TEST=None Review URL: https://chromiumcodereview.appspot.com/10388063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/gpu/gpu_main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 816bb39..031684a 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -99,11 +99,11 @@ int GpuMain(const content::MainFunctionParams& parameters) {
dead_on_arrival = true;
}
- // Warm up the random subsystem, which needs to done pre-sandbox on all
+ // Warm up the random subsystem, which needs to be done pre-sandbox on all
// platforms.
(void) base::RandUint64();
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
content::InitializeSandbox();
#endif