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

Unified Diff: ppapi/nacl_irt/plugin_startup.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
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
« components/nacl/loader/nacl_listener.cc ('K') | « content/renderer/pepper/host_dispatcher_wrapper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698