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

Unified Diff: content/renderer/render_thread_impl.cc

Issue 2653973002: Remove associated interface registration from ChannelProxy (Closed)
Patch Set: 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/gpu/gpu_child_thread.cc ('k') | ipc/ipc_channel_mojo_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 1dcaaa6f25a0819ac9b32f3e6748c033b2c1c9cf..e374de415e26daf612d5183a5ceb1f0a10207594 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1485,7 +1485,10 @@ RenderThreadImpl::GetLoadingTaskRunner() {
void RenderThreadImpl::OnAssociatedInterfaceRequest(
const std::string& name,
mojo::ScopedInterfaceEndpointHandle handle) {
- associated_interfaces_.BindRequest(name, std::move(handle));
+ if (associated_interfaces_.CanBindRequest(name))
+ associated_interfaces_.BindRequest(name, std::move(handle));
+ else
+ ChildThreadImpl::OnAssociatedInterfaceRequest(name, std::move(handle));
}
bool RenderThreadImpl::IsGpuRasterizationForced() {
« no previous file with comments | « content/gpu/gpu_child_thread.cc ('k') | ipc/ipc_channel_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698