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

Unified Diff: components/nacl/common/nacl_types.cc

Issue 332463003: Pepper: Remove LOAD_MODULE SRPC call in SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 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/common/nacl_types.cc
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index 0b096a65467e851fa2316380f06cf3e31c8f1495..4e237303691ccde84d9954c5b3c2081dd7f4aee9 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -9,6 +9,8 @@ namespace nacl {
NaClStartParams::NaClStartParams()
: nexe_file(IPC::InvalidPlatformFileForTransit()),
+ nexe_token_lo(0),
+ nexe_token_hi(0),
validation_cache_enabled(false),
enable_exception_handling(false),
enable_debug_stub(false),
@@ -33,6 +35,8 @@ NaClLaunchParams::NaClLaunchParams()
NaClLaunchParams::NaClLaunchParams(
const std::string& manifest_url,
const IPC::PlatformFileForTransit& nexe_file,
+ uint64_t nexe_token_lo,
+ uint64_t nexe_token_hi,
int render_view_id,
uint32 permission_bits,
bool uses_irt,
@@ -42,6 +46,8 @@ NaClLaunchParams::NaClLaunchParams(
bool enable_crash_throttling)
: manifest_url(manifest_url),
nexe_file(nexe_file),
+ nexe_token_lo(nexe_token_lo),
+ nexe_token_hi(nexe_token_hi),
render_view_id(render_view_id),
permission_bits(permission_bits),
uses_irt(uses_irt),
@@ -51,18 +57,6 @@ NaClLaunchParams::NaClLaunchParams(
enable_crash_throttling(enable_crash_throttling) {
}
-NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l)
- : manifest_url(l.manifest_url),
- nexe_file(l.nexe_file),
- render_view_id(l.render_view_id),
- permission_bits(l.permission_bits),
- uses_irt(l.uses_irt),
- uses_nonsfi_mode(l.uses_nonsfi_mode),
- enable_dyncode_syscalls(l.enable_dyncode_syscalls),
- enable_exception_handling(l.enable_exception_handling),
- enable_crash_throttling(l.enable_crash_throttling) {
-}
-
NaClLaunchParams::~NaClLaunchParams() {
}

Powered by Google App Engine
This is Rietveld 408576698