| Index: content/browser/gpu/gpu_process_host.cc
|
| diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
|
| index 7bf6292479864a22c1d37ecee7d5af3f4451301f..6ab1d3cd49704d88771a9869d97306d511577372 100644
|
| --- a/content/browser/gpu/gpu_process_host.cc
|
| +++ b/content/browser/gpu/gpu_process_host.cc
|
| @@ -279,6 +279,8 @@ class GpuSandboxedProcessLauncherDelegate
|
|
|
| } // anonymous namespace
|
|
|
| +// Single process not supported in multiple dll mode currently.
|
| +#if !defined(CHROME_MULTIPLE_DLL)
|
| // This class creates a GPU thread (instead of a GPU process), when running
|
| // with --in-process-gpu or --single-process.
|
| class GpuMainThread : public base::Thread {
|
| @@ -312,6 +314,7 @@ class GpuMainThread : public base::Thread {
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GpuMainThread);
|
| };
|
| +#endif // !CHROME_MULTIPLE_DLL
|
|
|
| // static
|
| bool GpuProcessHost::ValidateHost(GpuProcessHost* host) {
|
| @@ -596,6 +599,8 @@ bool GpuProcessHost::Init() {
|
| if (channel_id.empty())
|
| return false;
|
|
|
| + // Single process not supported in multiple dll mode currently.
|
| +#if !defined(CHROME_MULTIPLE_DLL)
|
| if (in_process_) {
|
| CommandLine::ForCurrentProcess()->AppendSwitch(
|
| switches::kDisableGpuWatchdog);
|
| @@ -604,7 +609,9 @@ bool GpuProcessHost::Init() {
|
| in_process_gpu_thread_->Start();
|
|
|
| OnProcessLaunched(); // Fake a callback that the process is ready.
|
| - } else if (!LaunchGpuProcess(channel_id)) {
|
| + } else
|
| +#endif // !CHROME_MULTIPLE_DLL
|
| + if (!LaunchGpuProcess(channel_id)) {
|
| return false;
|
| }
|
|
|
|
|