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

Unified Diff: content/renderer/pepper/host_dispatcher_wrapper.cc

Issue 2301103003: Use ChannelMojo for NaCl PPAPI channels. (Closed)
Patch Set: Created 4 years, 2 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 | « components/nacl/renderer/ppb_nacl_private_impl.cc ('k') | ipc/ipc_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/host_dispatcher_wrapper.cc
diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc
index 88d567a5cdb77d89db20998549ce965ca0e6c96b..1aebef90c6a407c3bb5a622f67d8335daf710abe 100644
--- a/content/renderer/pepper/host_dispatcher_wrapper.cc
+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
@@ -37,13 +37,16 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
PP_GetInterface_Func local_get_interface,
const ppapi::Preferences& preferences,
scoped_refptr<PepperHungPluginFilter> filter) {
- if (channel_handle.name.empty())
+ if (channel_handle.name.empty() && !channel_handle.is_mojo_channel_handle())
return false;
#if defined(OS_POSIX)
- DCHECK_NE(-1, channel_handle.socket.fd);
- if (channel_handle.socket.fd == -1)
+ DCHECK(channel_handle.socket.fd != -1 ||
+ channel_handle.is_mojo_channel_handle());
+ if (channel_handle.socket.fd == -1 &&
+ !channel_handle.is_mojo_channel_handle()) {
return false;
+ }
#endif
dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
« no previous file with comments | « components/nacl/renderer/ppb_nacl_private_impl.cc ('k') | ipc/ipc_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698