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

Side by Side Diff: components/nacl/common/nacl_types.cc

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, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/nacl/common/nacl_types.h" 5 #include "components/nacl/common/nacl_types.h"
6 #include "ipc/ipc_platform_file.h" 6 #include "ipc/ipc_platform_file.h"
7 7
8 namespace nacl { 8 namespace nacl {
9 9
10 NaClStartParams::NaClStartParams() 10 NaClStartParams::NaClStartParams()
(...skipping 15 matching lines...) Expand all
26 render_view_id(0), 26 render_view_id(0),
27 permission_bits(0), 27 permission_bits(0),
28 process_type(kUnknownNaClProcessType) { 28 process_type(kUnknownNaClProcessType) {
29 } 29 }
30 30
31 NaClLaunchParams::NaClLaunchParams( 31 NaClLaunchParams::NaClLaunchParams(
32 const std::string& manifest_url, 32 const std::string& manifest_url,
33 const IPC::PlatformFileForTransit& nexe_file, 33 const IPC::PlatformFileForTransit& nexe_file,
34 uint64_t nexe_token_lo, 34 uint64_t nexe_token_lo,
35 uint64_t nexe_token_hi, 35 uint64_t nexe_token_hi,
36 const std::vector<IPC::PlatformFileForTransit>& resource_files,
37 const std::vector<std::pair<uint64_t, uint64_t> >& resource_file_tokens,
38 const std::vector<std::string>& resource_keys,
36 int render_view_id, 39 int render_view_id,
37 uint32 permission_bits, 40 uint32 permission_bits,
38 bool uses_nonsfi_mode, 41 bool uses_nonsfi_mode,
39 NaClAppProcessType process_type) 42 NaClAppProcessType process_type)
40 : manifest_url(manifest_url), 43 : manifest_url(manifest_url),
41 nexe_file(nexe_file), 44 nexe_file(nexe_file),
42 nexe_token_lo(nexe_token_lo), 45 nexe_token_lo(nexe_token_lo),
43 nexe_token_hi(nexe_token_hi), 46 nexe_token_hi(nexe_token_hi),
47 resource_files(resource_files),
48 resource_file_tokens(resource_file_tokens),
49 resource_keys(resource_keys),
44 render_view_id(render_view_id), 50 render_view_id(render_view_id),
45 permission_bits(permission_bits), 51 permission_bits(permission_bits),
46 uses_nonsfi_mode(uses_nonsfi_mode), 52 uses_nonsfi_mode(uses_nonsfi_mode),
47 process_type(process_type) { 53 process_type(process_type) {
48 } 54 }
49 55
50 NaClLaunchParams::~NaClLaunchParams() { 56 NaClLaunchParams::~NaClLaunchParams() {
51 } 57 }
52 58
53 NaClLaunchResult::NaClLaunchResult() 59 NaClLaunchResult::NaClLaunchResult()
(...skipping 18 matching lines...) Expand all
72 trusted_ipc_channel_handle(trusted_ipc_channel_handle), 78 trusted_ipc_channel_handle(trusted_ipc_channel_handle),
73 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle), 79 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle),
74 plugin_pid(plugin_pid), 80 plugin_pid(plugin_pid),
75 plugin_child_id(plugin_child_id), 81 plugin_child_id(plugin_child_id),
76 crash_info_shmem_handle(crash_info_shmem_handle) { 82 crash_info_shmem_handle(crash_info_shmem_handle) {
77 } 83 }
78 84
79 NaClLaunchResult::~NaClLaunchResult() { 85 NaClLaunchResult::~NaClLaunchResult() {
80 } 86 }
81 87
88 NaClOpenExecutableResult::NaClOpenExecutableResult()
89 : file(IPC::InvalidPlatformFileForTransit()),
90 file_token_lo(0),
91 file_token_hi(0) {
92 }
93
94 NaClOpenExecutableResult::NaClOpenExecutableResult(
95 IPC::PlatformFileForTransit file,
96 uint64_t file_token_lo,
97 uint64_t file_token_hi,
98 const std::vector<IPC::PlatformFileForTransit>& resource_files,
99 const std::vector<std::pair<uint64_t, uint64_t> >& resource_file_tokens)
100 : file(file),
101 file_token_lo(file_token_lo),
102 file_token_hi(file_token_hi),
103 resource_files(resource_files),
104 resource_file_tokens(resource_file_tokens) {
105 }
106
107 NaClOpenExecutableResult::~NaClOpenExecutableResult() {
108 }
109
82 } // namespace nacl 110 } // namespace nacl
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698