| OLD | NEW |
| 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 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 5 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 6 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 ~NaClResourcePrefetchResult(); | 60 ~NaClResourcePrefetchResult(); |
| 61 | 61 |
| 62 IPC::PlatformFileForTransit file; | 62 IPC::PlatformFileForTransit file; |
| 63 base::FilePath file_path_metadata; // a key for validation caching | 63 base::FilePath file_path_metadata; // a key for validation caching |
| 64 std::string file_key; // a key for open_resource | 64 std::string file_key; // a key for open_resource |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 // Parameters sent to the NaCl process when we start it. | 67 // Parameters sent to the NaCl process when we start it. |
| 68 struct NaClStartParams { | 68 struct NaClStartParams { |
| 69 NaClStartParams(); | 69 NaClStartParams(); |
| 70 NaClStartParams(const NaClStartParams& other); |
| 70 ~NaClStartParams(); | 71 ~NaClStartParams(); |
| 71 | 72 |
| 72 IPC::PlatformFileForTransit nexe_file; | 73 IPC::PlatformFileForTransit nexe_file; |
| 73 // Used only as a key for validation caching. | 74 // Used only as a key for validation caching. |
| 74 base::FilePath nexe_file_path_metadata; | 75 base::FilePath nexe_file_path_metadata; |
| 75 | 76 |
| 76 IPC::PlatformFileForTransit irt_handle; | 77 IPC::PlatformFileForTransit irt_handle; |
| 77 #if defined(OS_MACOSX) | 78 #if defined(OS_MACOSX) |
| 78 IPC::PlatformFileForTransit mac_shm_fd; | 79 IPC::PlatformFileForTransit mac_shm_fd; |
| 79 #endif | 80 #endif |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 NaClLaunchParams(const std::string& manifest_url, | 122 NaClLaunchParams(const std::string& manifest_url, |
| 122 const IPC::PlatformFileForTransit& nexe_file, | 123 const IPC::PlatformFileForTransit& nexe_file, |
| 123 uint64_t nexe_token_lo, | 124 uint64_t nexe_token_lo, |
| 124 uint64_t nexe_token_hi, | 125 uint64_t nexe_token_hi, |
| 125 const std::vector<NaClResourcePrefetchRequest>& | 126 const std::vector<NaClResourcePrefetchRequest>& |
| 126 resource_prefetch_request_list, | 127 resource_prefetch_request_list, |
| 127 int render_view_id, | 128 int render_view_id, |
| 128 uint32_t permission_bits, | 129 uint32_t permission_bits, |
| 129 bool uses_nonsfi_mode, | 130 bool uses_nonsfi_mode, |
| 130 NaClAppProcessType process_type); | 131 NaClAppProcessType process_type); |
| 132 NaClLaunchParams(const NaClLaunchParams& other); |
| 131 ~NaClLaunchParams(); | 133 ~NaClLaunchParams(); |
| 132 | 134 |
| 133 std::string manifest_url; | 135 std::string manifest_url; |
| 134 // On Windows, the HANDLE passed here is valid in the renderer's context. | 136 // On Windows, the HANDLE passed here is valid in the renderer's context. |
| 135 // It's the responsibility of the browser to duplicate this handle properly | 137 // It's the responsibility of the browser to duplicate this handle properly |
| 136 // for passing it to the plugin. | 138 // for passing it to the plugin. |
| 137 IPC::PlatformFileForTransit nexe_file; | 139 IPC::PlatformFileForTransit nexe_file; |
| 138 uint64_t nexe_token_lo; | 140 uint64_t nexe_token_lo; |
| 139 uint64_t nexe_token_hi; | 141 uint64_t nexe_token_hi; |
| 140 std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list; | 142 std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 170 base::ProcessId plugin_pid; | 172 base::ProcessId plugin_pid; |
| 171 int plugin_child_id; | 173 int plugin_child_id; |
| 172 | 174 |
| 173 // For NaCl <-> renderer crash information reporting. | 175 // For NaCl <-> renderer crash information reporting. |
| 174 base::SharedMemoryHandle crash_info_shmem_handle; | 176 base::SharedMemoryHandle crash_info_shmem_handle; |
| 175 }; | 177 }; |
| 176 | 178 |
| 177 } // namespace nacl | 179 } // namespace nacl |
| 178 | 180 |
| 179 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ | 181 #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_ |
| OLD | NEW |