Chromium Code Reviews| Index: ppapi/nacl_irt/plugin_startup.cc |
| diff --git a/ppapi/nacl_irt/plugin_startup.cc b/ppapi/nacl_irt/plugin_startup.cc |
| index b90f14ae80123e7535a58695ddf8e1f52b94a18b..f59655e1d5f1f1868b46018006a8b5bdd59b51db 100644 |
| --- a/ppapi/nacl_irt/plugin_startup.cc |
| +++ b/ppapi/nacl_irt/plugin_startup.cc |
| @@ -27,8 +27,7 @@ base::Thread* g_io_thread = NULL; |
| ManifestService* g_manifest_service = NULL; |
| bool IsValidChannelHandle(IPC::ChannelHandle* handle) { |
| - // ChannelMojo not yet supported. |
| - return handle && handle->socket.fd != -1 && !handle->mojo_handle.is_valid(); |
| + return handle && (handle->socket.fd != -1 || handle->mojo_handle.is_valid()); |
|
Mark Seaborn
2016/10/13 21:27:51
Shouldn't this only accept Mojo handles?
Sam McNally
2016/10/14 02:35:03
It's used by both SFI and non-SFI. In SFI mode the
|
| } |
| // Creates the manifest service on IO thread so that its Listener's thread and |