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
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index f3d1a1dd..dae0f65 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -94,23 +94,18 @@
base::Time start_time = base::Time::Now();
- bool in_browser_process = command_line.HasSwitch(switches::kSingleProcess) ||
- command_line.HasSwitch(switches::kInProcessGPU);
-
- if (!in_browser_process) {
#if defined(OS_WIN)
- // Prevent Windows from displaying a modal dialog on failures like not being
- // able to load a DLL.
- SetErrorMode(
- SEM_FAILCRITICALERRORS |
- SEM_NOGPFAULTERRORBOX |
- SEM_NOOPENFILEERRORBOX);
+ // Prevent Windows from displaying a modal dialog on failures like not being
+ // able to load a DLL.
+ SetErrorMode(
+ SEM_FAILCRITICALERRORS |
+ SEM_NOGPFAULTERRORBOX |
+ SEM_NOOPENFILEERRORBOX);
#elif defined(USE_X11)
- ui::SetDefaultX11ErrorHandlers();
+ ui::SetDefaultX11ErrorHandlers();
#endif
- logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
- }
+ logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
std::string types = command_line.GetSwitchValueASCII(
