content/child/child_thread_impl.cc - Issue 1960513002: [Merge to M50] IPC: Fix attachment brokering race condition.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/child/child_thread_impl.cc

Issue 1960513002: [Merge to M50] IPC: Fix attachment brokering race condition. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: content/child/child_thread_impl.cc

diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc

index 2999a12aa8205a11e8304e1eeb7512f5f768010f..21a6137e51f431da67b36ebefd57188ddcea1ec4 100644

--- a/content/child/child_thread_impl.cc

+++ b/content/child/child_thread_impl.cc

@@ -451,10 +451,10 @@ void ChildThreadImpl::Init(const Options& options) {

channel_->AddFilter(startup_filter);

}

- ConnectChannel(options.use_mojo_channel);

IPC::AttachmentBroker* broker = IPC::AttachmentBroker::GetGlobal();

if (broker && !broker->IsPrivilegedBroker())

broker->RegisterBrokerCommunicationChannel(channel_.get());

+ ConnectChannel(options.use_mojo_channel);

int connection_timeout = kConnectionTimeoutS;

std::string connection_override =

« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/common/child_process_host_impl.cc » ('j') | no next file with comments »