| Index: components/nacl/renderer/ppb_nacl_private_impl.cc
|
| diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| index 00e0c06ea508de7b99d7d4f4ec755d174f2e99a6..ec7f6470d438d6141029fd99d4934578b68f0ac0 100644
|
| --- a/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
|
| @@ -252,6 +252,7 @@ int32_t FileDownloaderToPepperError(FileDownloader::Status status) {
|
| void LaunchSelLdr(PP_Instance instance,
|
| PP_Bool main_service_runtime,
|
| const char* alleged_url,
|
| + const PP_NaClFileInfo* nexe_file_info,
|
| PP_Bool uses_irt,
|
| PP_Bool uses_ppapi,
|
| PP_Bool uses_nonsfi_mode,
|
| @@ -307,15 +308,21 @@ void LaunchSelLdr(PP_Instance instance,
|
| std::string error_message_string;
|
| NaClLaunchResult launch_result;
|
|
|
| + content::RendererPpapiHost* host =
|
| + content::RendererPpapiHost::GetForPPInstance(instance);
|
| if (!sender->Send(new NaClHostMsg_LaunchNaCl(
|
| - NaClLaunchParams(instance_info.url.spec(),
|
| - routing_id,
|
| - perm_bits,
|
| - PP_ToBool(uses_irt),
|
| - PP_ToBool(uses_nonsfi_mode),
|
| - PP_ToBool(enable_dyncode_syscalls),
|
| - PP_ToBool(enable_exception_handling),
|
| - PP_ToBool(enable_crash_throttling)),
|
| + NaClLaunchParams(
|
| + instance_info.url.spec(),
|
| + host->ShareHandleWithRemote(nexe_file_info->handle, true),
|
| + nexe_file_info->token_lo,
|
| + nexe_file_info->token_hi,
|
| + routing_id,
|
| + perm_bits,
|
| + PP_ToBool(uses_irt),
|
| + PP_ToBool(uses_nonsfi_mode),
|
| + PP_ToBool(enable_dyncode_syscalls),
|
| + PP_ToBool(enable_exception_handling),
|
| + PP_ToBool(enable_crash_throttling)),
|
| &launch_result,
|
| &error_message_string))) {
|
| ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
|
|
|