diff options
| author | davidu@nvidia.com <davidu@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 15:31:03 +0000 |
|---|---|---|
| committer | davidu@nvidia.com <davidu@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 15:31:03 +0000 |
| commit | 3746ed84112e6982f1230441ac9a423eda09855f (patch) | |
| tree | 673bb64ef970a082224d6a109ede00d6f621d0ca /content/gpu | |
| parent | 02a67fd4967598574031c7cd1a4b540aaf2975db (diff) | |
| download | chromium_src-3746ed84112e6982f1230441ac9a423eda09855f.zip chromium_src-3746ed84112e6982f1230441ac9a423eda09855f.tar.gz chromium_src-3746ed84112e6982f1230441ac9a423eda09855f.tar.bz2 | |
Don't start the SECCOMP sandbox early for Tegra124
Let the sandbox start normally and don't start the sandbox early.
Tegra124 libraries no longer need preloading of libraries or a whitelist
policy.
Add flag --gpu-sandbox-start-after-initialization to prevent the sandbox starting early.
BUG=none
TEST=Boot browser and about:gpu shows sandboxed to be true.
Review URL: https://codereview.chromium.org/179983006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index d478113..fe4d3ce 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)) { + gpu_info.sandboxed = StartSandboxLinux(gpu_info, watchdog_thread.get(), + should_initialize_gl_context); + initialized_sandbox = true; + } #endif #endif // defined(OS_LINUX) |