diff options
author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:50:57 +0000 |
---|---|---|
committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-28 23:50:57 +0000 |
commit | 278178908488e30706a6601c44af0738e12dc922 (patch) | |
tree | b6df2bea6dec80ceb0fec128d1a09a7f905ab675 | |
parent | dd5adf6de17eb0176dd3b1eb775d7508ea68a6ef (diff) | |
download | chromium_src-278178908488e30706a6601c44af0738e12dc922.zip chromium_src-278178908488e30706a6601c44af0738e12dc922.tar.gz chromium_src-278178908488e30706a6601c44af0738e12dc922.tar.bz2 |
Added command line switch to disable GPU sandbox.
It doesn't do anything yet. Enabling the GPU process sandbox is a work in progress.
TEST=try
BUG=none
Review URL: http://codereview.chromium.org/6592051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76312 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_switches.h | 1 | ||||
-rw-r--r-- | content/browser/gpu_process_host.cc | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 45842f4..0d06d73 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -265,6 +265,9 @@ const char kDisableGLMultisampling[] = "disable-gl-multisampling"; // Disable the GLSL translator. const char kDisableGLSLTranslator[] = "disable-glsl-translator"; +// Disable the GPU process sandbox. +const char kDisableGpuSandbox[] = "disable-gpu-sandbox"; + // Disable the thread that crashes the GPU process if it stops responding to // messages. const char kDisableGpuWatchdog[] = "disable-gpu-watchdog"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index cbd9bd3..c2626ab 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -85,6 +85,7 @@ extern const char kDisableFlashSandbox[]; extern const char kDisableGLMultisampling[]; extern const char kDisableGLSLTranslator[]; extern const char kDisableGeolocation[]; +extern const char kDisableGpuSandbox[]; extern const char kDisableGpuWatchdog[]; extern const char kDisableHangMonitor[]; extern const char kDisableHistoryQuickProvider[]; diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu_process_host.cc index 6a4ee2d..61936f6 100644 --- a/content/browser/gpu_process_host.cc +++ b/content/browser/gpu_process_host.cc @@ -284,6 +284,7 @@ bool GpuProcessHost::LaunchGpuProcess() { // Propagate relevant command line switches. static const char* const kSwitchNames[] = { switches::kUseGL, + switches::kDisableGpuSandbox, switches::kDisableGpuVsync, switches::kDisableGpuWatchdog, switches::kDisableLogging, |