summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_process_host.cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 02:56:02 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-10 02:56:02 +0000
commit43325a372577d31b56983a155d8dc90eeea1a05b (patch)
tree72482263059bf50d11efa562c734f12b484db583 /content/browser/gpu/gpu_process_host.cc
parent3afb8de34ed70aa878bd65926ac07613e89a0b59 (diff)
downloadchromium_src-43325a372577d31b56983a155d8dc90eeea1a05b.zip
chromium_src-43325a372577d31b56983a155d8dc90eeea1a05b.tar.gz
chromium_src-43325a372577d31b56983a155d8dc90eeea1a05b.tar.bz2
Also append GPU command-line flags to the browser in single-process mode
BUG=314909 Review URL: https://codereview.chromium.org/129633002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_process_host.cc')
-rw-r--r--content/browser/gpu/gpu_process_host.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 9e5861e..e533225 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -578,8 +578,12 @@ bool GpuProcessHost::Init() {
if (in_process_) {
DCHECK(g_gpu_main_thread_factory);
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kDisableGpuWatchdog);
+ CommandLine* command_line = CommandLine::ForCurrentProcess();
+ command_line->AppendSwitch(switches::kDisableGpuWatchdog);
+
+ GpuDataManagerImpl* gpu_data_manager = GpuDataManagerImpl::GetInstance();
+ DCHECK(gpu_data_manager);
+ gpu_data_manager->AppendGpuCommandLine(command_line);
in_process_gpu_thread_.reset(g_gpu_main_thread_factory(channel_id));
in_process_gpu_thread_->Start();