content/renderer/pepper/host_dispatcher_wrapper.cc - Issue 2151153002: Use ChannelMojo for NaCl IRT channels in non-sfi mode.

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/renderer/pepper/host_dispatcher_wrapper.cc

Issue 2151153002: Use ChannelMojo for NaCl IRT channels in non-sfi mode. Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-nacl-channel-mojo

Patch Set: rebase Created 4 years, 5 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/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..034dadc1260f672e9feaae078898c366b18ab56f 100644

--- a/content/renderer/pepper/host_dispatcher_wrapper.cc

+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc

@@ -41,8 +41,9 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& 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.mojo_handle.is_valid());

+ if (channel_handle.socket.fd == -1 && !channel_handle.mojo_handle.is_valid())

return false;

#endif

« no previous file with comments | « components/nacl/renderer/ppb_nacl_private_impl.cc ('k') | ppapi/nacl_irt/plugin_startup.cc » ('j') | no next file with comments »