summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 05:50:30 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-13 05:50:30 +0000
commit465a1ef8c142916db80f3d32f6c2ce9c160ec5c5 (patch)
tree279d6732041015447def7112d3821dd45d4aff93 /content
parent4024aa9275329757b403740004b4c12874cd140c (diff)
downloadchromium_src-465a1ef8c142916db80f3d32f6c2ce9c160ec5c5.zip
chromium_src-465a1ef8c142916db80f3d32f6c2ce9c160ec5c5.tar.gz
chromium_src-465a1ef8c142916db80f3d32f6c2ce9c160ec5c5.tar.bz2
Make it so you can add GPU switches by editing 2 files instead of 3.
TEST=none BUG=none R=apatrick@chromium.org Review URL: http://codereview.chromium.org/10065025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gpu/gpu_process_host.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 2218c3d2..c4d4e4c 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -700,20 +700,15 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) {
// Propagate relevant command line switches.
static const char* const kSwitchNames[] = {
- switches::kCompileShaderAlwaysSucceeds,
switches::kDisableBreakpad,
switches::kDisableGLMultisampling,
switches::kDisableGpuDriverBugWorkarounds,
switches::kDisableGpuSandbox,
switches::kReduceGpuSandbox,
- switches::kDisableGLSLTranslator,
switches::kDisableGpuVsync,
switches::kDisableGpuWatchdog,
switches::kDisableImageTransportSurface,
switches::kDisableLogging,
- switches::kEnableGPUCommandLogging,
- switches::kEnableGPUDebugging,
- switches::kEnableGPUServiceLogging,
switches::kEnableLogging,
#if defined(OS_MACOSX)
switches::kEnableSandboxLogging,
@@ -729,6 +724,8 @@ bool GpuProcessHost::LaunchGpuProcess(const std::string& channel_id) {
};
cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
arraysize(kSwitchNames));
+ cmd_line->CopySwitchesFrom(
+ browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches);
content::GetContentClient()->browser()->AppendExtraCommandLineSwitches(
cmd_line, process_->GetData().id);