diff options
| author | jam <jam@chromium.org> | 2015-11-13 10:07:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 18:08:50 +0000 |
| commit | bd8d85445b843b795b0915703d0f844342dee4e3 (patch) | |
| tree | d7bf6b06209b0afd35ba0b747fc53fa7806a1614 /ipc/mojo | |
| parent | 30996193fe3e69fe9ccd52471900bf5685c54956 (diff) | |
| download | chromium_src-bd8d85445b843b795b0915703d0f844342dee4e3.zip chromium_src-bd8d85445b843b795b0915703d0f844342dee4e3.tar.gz chromium_src-bd8d85445b843b795b0915703d0f844342dee4e3.tar.bz2 | |
Fix racy crash in Mandoline child processes.
The problem is with the new EDK, the IO task runner pointer needs to be initialized before MojoMessagePump is created (in child_process.cc). The rest of the change is removing the delegate thread from the InitIPCSupport function.
BUG=478251
Committed: https://crrev.com/ee99b2d9ec86aa5bbc69169ea26964a6792d286b
Cr-Commit-Position: refs/heads/master@{#359266}
Review URL: https://codereview.chromium.org/1439863002
Cr-Commit-Position: refs/heads/master@{#359583}
Diffstat (limited to 'ipc/mojo')
| -rw-r--r-- | ipc/mojo/scoped_ipc_support.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mojo/scoped_ipc_support.cc b/ipc/mojo/scoped_ipc_support.cc index 2465aa2..58ee518 100644 --- a/ipc/mojo/scoped_ipc_support.cc +++ b/ipc/mojo/scoped_ipc_support.cc @@ -104,8 +104,8 @@ void IPCSupportInitializer::Init( io_thread_task_runner_->PostTask( FROM_HERE, base::Bind(&WatchMessageLoopOnIOThread, observer_)); mojo::embedder::InitIPCSupport( - mojo::embedder::ProcessType::NONE, io_thread_task_runner_, this, - io_thread_task_runner_, mojo::embedder::ScopedPlatformHandle()); + mojo::embedder::ProcessType::NONE, this, io_thread_task_runner_, + mojo::embedder::ScopedPlatformHandle()); } } |