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

Unified Diff: trunk/src/components/nacl/renderer/ppb_nacl_private_impl.cc

Issue 413063003: Revert 285028 "Pepper: Remove LOAD_MODULE SRPC call in SFI mode." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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: trunk/src/components/nacl/renderer/ppb_nacl_private_impl.cc
===================================================================
--- trunk/src/components/nacl/renderer/ppb_nacl_private_impl.cc (revision 285116)
+++ trunk/src/components/nacl/renderer/ppb_nacl_private_impl.cc (working copy)
@@ -346,25 +346,12 @@
std::string error_message_string;
NaClLaunchResult launch_result;
- IPC::PlatformFileForTransit nexe_for_transit =
- IPC::InvalidPlatformFileForTransit();
-#if defined(OS_POSIX)
- if (nexe_file_info->handle != PP_kInvalidFileHandle)
- nexe_for_transit = base::FileDescriptor(nexe_file_info->handle, true);
-#elif defined(OS_WIN)
- // Duplicate the handle on the browser side instead of the renderer.
- // This is because BrokerGetFileForProcess isn't part of content/public, and
- // it's simpler to do the duplication in the browser anyway.
- nexe_for_transit = nexe_file_info->handle;
-#else
-#error Unsupported target platform.
-#endif
+ content::RendererPpapiHost* host =
+ content::RendererPpapiHost::GetForPPInstance(instance);
if (!sender->Send(new NaClHostMsg_LaunchNaCl(
NaClLaunchParams(
instance_info.url.spec(),
- nexe_for_transit,
- nexe_file_info->token_lo,
- nexe_file_info->token_hi,
+ host->ShareHandleWithRemote(nexe_file_info->handle, true),
routing_id,
perm_bits,
PP_ToBool(uses_irt),
« no previous file with comments | « trunk/src/components/nacl/loader/nacl_listener.cc ('k') | trunk/src/ppapi/native_client/src/trusted/plugin/plugin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698