Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(947)

Unified Diff: content/browser/browser_child_process_host_impl.cc

Issue 2625933002: content/gpu: Set up a mojom connection between browser and gpu. (Closed)
Patch Set: tot merge Created 3 years, 11 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
« no previous file with comments | « content/browser/browser_child_process_host_impl.h ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_child_process_host_impl.cc
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc
index f4b000d3d2c9c9519344b6fa2fd65ae89357bf37..70dc310a22be7693d64e27e90819bd4512f2954f 100644
--- a/content/browser/browser_child_process_host_impl.cc
+++ b/content/browser/browser_child_process_host_impl.cc
@@ -161,6 +161,7 @@ BrowserChildProcessHostImpl::BrowserChildProcessHostImpl(
: data_(process_type),
delegate_(delegate),
child_token_(mojo::edk::GenerateRandomToken()),
+ channel_(nullptr),
is_channel_connected_(false),
notify_child_disconnected_(false),
weak_factory_(this) {
@@ -397,6 +398,10 @@ bool BrowserChildProcessHostImpl::CanShutdown() {
return delegate_->CanShutdown();
}
+void BrowserChildProcessHostImpl::OnChannelInitialized(IPC::Channel* channel) {
+ channel_ = channel;
+}
+
void BrowserChildProcessHostImpl::OnChildDisconnected() {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
#if defined(OS_WIN)
@@ -456,6 +461,7 @@ void BrowserChildProcessHostImpl::OnChildDisconnected() {
}
#endif
}
+ channel_ = nullptr;
delete delegate_; // Will delete us
}
« no previous file with comments | « content/browser/browser_child_process_host_impl.h ('k') | content/browser/gpu/gpu_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698