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

Unified Diff: components/nacl/browser/nacl_process_host.h

Issue 649603004: Non-SFI NaCl: Batch-open resource files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code review Created 6 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: components/nacl/browser/nacl_process_host.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index 6db28c0db5791d1db800525269f162238a6706f1..280cc7c50df420d501dc694515f2639a14da0b97 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -7,6 +7,10 @@
#include "build/build_config.h"
+#include <string>
+#include <utility>
+#include <vector>
+
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util_proxy.h"
@@ -57,16 +61,20 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
// off_the_record: was the process launched from an incognito renderer?
// process_type: the type of NaCl process.
// profile_directory: is the path of current profile directory.
- NaClProcessHost(const GURL& manifest_url,
- base::File nexe_file,
- const NaClFileToken& nexe_token,
- ppapi::PpapiPermissions permissions,
- int render_view_id,
- uint32 permission_bits,
- bool uses_nonsfi_mode,
- bool off_the_record,
- NaClAppProcessType process_type,
- const base::FilePath& profile_directory);
+ NaClProcessHost(
+ const GURL& manifest_url,
+ base::File nexe_file,
+ const NaClFileToken& nexe_token,
+ scoped_ptr<base::File[]> resource_files,
+ const std::vector<std::pair<uint64_t, uint64_t> >& resource_file_tokens,
+ const std::vector<std::string>& resource_keys,
+ ppapi::PpapiPermissions permissions,
+ int render_view_id,
+ uint32 permission_bits,
+ bool uses_nonsfi_mode,
+ bool off_the_record,
+ NaClAppProcessType process_type,
+ const base::FilePath& profile_directory);
~NaClProcessHost() override;
void OnProcessCrashed(int exit_status) override;
@@ -183,6 +191,10 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
base::File nexe_file_;
NaClFileToken nexe_token_;
+ scoped_ptr<base::File[]> resource_files_;
+ std::vector<std::pair<uint64_t, uint64_t> > resource_file_tokens_;
+ std::vector<std::string> resource_keys_;
+
ppapi::PpapiPermissions permissions_;
#if defined(OS_WIN)

Powered by Google App Engine
This is Rietveld 408576698