Commit a2573b05 authored by Zhenyao Mo's avatar Zhenyao Mo Committed by Commit Bot

Resolve a crash in --in-process-gpu mode

BUG=961558
TEST=manual
R=piman@chromium.org

Change-Id: Iea2a80e0cc85315008283e6e2470fc93c149309f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610489Reviewed-by: default avatarAntoine Labour <piman@chromium.org>
Commit-Queue: Zhenyao Mo <zmo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659371}
parent 1a662832
...@@ -85,7 +85,9 @@ void ChromeContentGpuClient::GpuServiceInitialized( ...@@ -85,7 +85,9 @@ void ChromeContentGpuClient::GpuServiceInitialized(
// This doesn't work in single-process mode. // This doesn't work in single-process mode.
if (!base::CommandLine::ForCurrentProcess()->HasSwitch( if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kSingleProcess)) { switches::kSingleProcess) &&
!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kInProcessGPU)) {
main_thread_profiler_->SetMainThreadTaskRunner( main_thread_profiler_->SetMainThreadTaskRunner(
base::ThreadTaskRunnerHandle::Get()); base::ThreadTaskRunnerHandle::Get());
ThreadProfiler::SetServiceManagerConnectorForChildProcess( ThreadProfiler::SetServiceManagerConnectorForChildProcess(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment