Non-SFI NaCl: Batch-open resource files

components/nacl/common/nacl_types.cc

Index: components/nacl/common/nacl_types.cc
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index d7a4fb80802df2bddeb45aeaf644b9d75e61ed79..f0d8e6457a48572eb7fd8712302efe25ff712fc4 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -21,6 +21,20 @@ NaClStartParams::NaClStartParams()
 NaClStartParams::~NaClStartParams() {
 }
 
+NaClStartParams::ResourceFileInfo::ResourceFileInfo()
+    : file(IPC::InvalidPlatformFileForTransit()) {
+}
+
+NaClStartParams::ResourceFileInfo::ResourceFileInfo(
+    IPC::PlatformFileForTransit file,
+    const base::FilePath& file_path_metadata,
+    const std::string& file_key)
+    : file(file), file_path_metadata(file_path_metadata), file_key(file_key) {
+}
+
+NaClStartParams::ResourceFileInfo::~ResourceFileInfo() {
+}
+
 NaClLaunchParams::NaClLaunchParams()
     : nexe_file(IPC::InvalidPlatformFileForTransit()),
       nexe_token_lo(0),
@@ -35,6 +49,7 @@ NaClLaunchParams::NaClLaunchParams(
     const IPC::PlatformFileForTransit& nexe_file,
     uint64_t nexe_token_lo,
     uint64_t nexe_token_hi,
+    const std::vector<ResourceFileInfo>& resource_files_info,
     int render_view_id,
     uint32 permission_bits,
     bool uses_nonsfi_mode,
@@ -43,6 +58,7 @@ NaClLaunchParams::NaClLaunchParams(
       nexe_file(nexe_file),
       nexe_token_lo(nexe_token_lo),
       nexe_token_hi(nexe_token_hi),
+      resource_files_info(resource_files_info),
       render_view_id(render_view_id),
       permission_bits(permission_bits),
       uses_nonsfi_mode(uses_nonsfi_mode),
@@ -52,6 +68,26 @@ NaClLaunchParams::NaClLaunchParams(
 NaClLaunchParams::~NaClLaunchParams() {
 }
 
+NaClLaunchParams::ResourceFileInfo::ResourceFileInfo()
+    : file(IPC::InvalidPlatformFileForTransit()),
+      file_token_lo(0),
+      file_token_hi(0) {
+}
+
+NaClLaunchParams::ResourceFileInfo::ResourceFileInfo(
+    IPC::PlatformFileForTransit file,
+    uint64_t file_token_lo,
+    uint64_t file_token_hi,
+    const std::string& file_key)
+    : file(file),
+      file_token_lo(file_token_lo),
+      file_token_hi(file_token_hi),
+      file_key(file_key) {
+}
+
+NaClLaunchParams::ResourceFileInfo::~ResourceFileInfo() {
+}
+
 NaClLaunchResult::NaClLaunchResult()
     : imc_channel_handle(IPC::InvalidPlatformFileForTransit()),
       ppapi_ipc_channel_handle(),
@@ -81,4 +117,34 @@ NaClLaunchResult::NaClLaunchResult(
 NaClLaunchResult::~NaClLaunchResult() {
 }
 
+NaClOpenExecutableResult::NaClOpenExecutableResult() {
+}
+
+NaClOpenExecutableResult::NaClOpenExecutableResult(
+    const NaClOpenExecutableResult::FileInfo& file_info,
+    const std::vector<NaClOpenExecutableResult::FileInfo>& resource_files_info)
+    : file_info(file_info),
+      resource_files_info(resource_files_info) {
+}
+
+NaClOpenExecutableResult::~NaClOpenExecutableResult() {
+}
+
+NaClOpenExecutableResult::FileInfo::FileInfo()
+    : file(IPC::InvalidPlatformFileForTransit()),
+      file_token_lo(0),
+      file_token_hi(0) {
+}
+
+NaClOpenExecutableResult::FileInfo::FileInfo(IPC::PlatformFileForTransit file,
+                                             uint64_t file_token_lo,
+                                             uint64_t file_token_hi)
+    : file(file),
+      file_token_lo(file_token_lo),
+      file_token_hi(file_token_hi) {
+}
+
+NaClOpenExecutableResult::FileInfo::~FileInfo() {
+}
+
 }  // namespace nacl