Index: components/nacl/loader/nonsfi/nonsfi_listener.cc |
diff --git a/components/nacl/loader/nonsfi/nonsfi_listener.cc b/components/nacl/loader/nonsfi/nonsfi_listener.cc |
index d0d51f1083863f8e9f1f25425747b053687ee36f..5f212babe28493ceace4e5cca3420c6ea80fc720 100644 |
--- a/components/nacl/loader/nonsfi/nonsfi_listener.cc |
+++ b/components/nacl/loader/nonsfi/nonsfi_listener.cc |
@@ -18,6 +18,7 @@ |
#include "ipc/ipc_channel_handle.h" |
#include "ipc/ipc_switches.h" |
#include "ipc/ipc_sync_channel.h" |
+#include "ppapi/nacl_irt/irt_manifest.h" |
#include "ppapi/nacl_irt/plugin_startup.h" |
#if defined(OS_NACL_NONSFI) |
@@ -156,6 +157,16 @@ void NonSfiListener::OnStart(const nacl::NaClStartParams& params) { |
CHECK(params.nexe_file != IPC::InvalidPlatformFileForTransit()); |
CHECK(params.nexe_file_path_metadata.empty()); |
+ std::map<std::string, int>* key_fd_map = new std::map<std::string, int>; |
+ for (size_t i = 0; i < params.prefetched_resource_files.size(); ++i) { |
+ CHECK(params.prefetched_resource_files[i].file_path_metadata.empty()); |
+ key_fd_map->insert(std::make_pair( |
+ params.prefetched_resource_files[i].file_key, |
Mark Seaborn
2015/03/04 05:07:30
Nit: Can you make it consistent whether we use (ke
Yusuke Sato
2015/03/04 18:45:49
I'd use (key, value) everywhere. Done. (this part
|
+ IPC::PlatformFileForTransitToPlatformFile( |
+ params.prefetched_resource_files[i].file))); |
+ } |
+ ppapi::RegisterPreopenedDescriptorsNonSfi(key_fd_map); |
+ |
MainStart(IPC::PlatformFileForTransitToPlatformFile(params.nexe_file)); |
} |