summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_process_host.cc
diff options
context:
space:
mode:
authordongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-24 22:49:55 +0000
committerdongseong.hwang@intel.com <dongseong.hwang@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-24 22:49:55 +0000
commit528194730156b663c09a72ce6494603bcf3645f0 (patch)
tree7ac7020ac8c4440e0c963effeb969f967a2f80ab /content/browser/gpu/gpu_process_host.cc
parentb97074df7e28ccd9c7b158c230f04b1a4c3ad8b6 (diff)
downloadchromium_src-528194730156b663c09a72ce6494603bcf3645f0.zip
chromium_src-528194730156b663c09a72ce6494603bcf3645f0.tar.gz
chromium_src-528194730156b663c09a72ce6494603bcf3645f0.tar.bz2
Clear SingleProcess and InProcessGPU logic.
1. SingleProcess and InProcessGPU mode are not supported in multiple-dll mode currently. Add CHECK() in RunNamedProcessTypeMain(). 2. GPU Process. 1) Currently, if InProcessGPU mode is enabled and g_gpu_main_thread_factory is not set, launch GPU Process slightly. However, other InProcessGPU code does not check if g_gpu_main_thread_factory is not set. It is a potential bug. 2) GpuMain() can not be called when SingleProcess or InProcessGPU mode. Remove SingleProcess and InProcessGPU switch check code. 3. Currently, if SingleProcess mode is enabled and g_renderer_main_thread_factory is not set, launch Render Process slightly. It is a potential bug. 4. Currently, if SingleProcess mode is enabled and g_utility_main_thread_factory is not set, launch Utility Process slightly. It is a potential bug. Review URL: https://codereview.chromium.org/65193003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237011 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_process_host.cc')
-rw-r--r--content/browser/gpu/gpu_process_host.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 9ddd540..2cb5874 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -563,7 +563,8 @@ bool GpuProcessHost::Init() {
if (channel_id.empty())
return false;
- if (in_process_ && g_gpu_main_thread_factory) {
+ if (in_process_) {
+ DCHECK(g_gpu_main_thread_factory);
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableGpuWatchdog);