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 #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 10 matching lines...) Expand all Loading... |
21 | 21 |
22 NaClLaunchParams::NaClLaunchParams() | 22 NaClLaunchParams::NaClLaunchParams() |
23 : render_view_id(0), | 23 : render_view_id(0), |
24 permission_bits(0), | 24 permission_bits(0), |
25 uses_irt(false), | 25 uses_irt(false), |
26 enable_dyncode_syscalls(false), | 26 enable_dyncode_syscalls(false), |
27 enable_exception_handling(false), | 27 enable_exception_handling(false), |
28 enable_crash_throttling(false) { | 28 enable_crash_throttling(false) { |
29 } | 29 } |
30 | 30 |
31 NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, | 31 NaClLaunchParams::NaClLaunchParams(const std::string& document_url, |
| 32 const std::string& manifest_url, |
32 int render_view_id, | 33 int render_view_id, |
33 uint32 permission_bits, | 34 uint32 permission_bits, |
34 bool uses_irt, | 35 bool uses_irt, |
35 bool uses_nonsfi_mode, | 36 bool uses_nonsfi_mode, |
36 bool enable_dyncode_syscalls, | 37 bool enable_dyncode_syscalls, |
37 bool enable_exception_handling, | 38 bool enable_exception_handling, |
38 bool enable_crash_throttling) | 39 bool enable_crash_throttling) |
39 : manifest_url(manifest_url), | 40 : document_url(document_url), |
| 41 manifest_url(manifest_url), |
40 render_view_id(render_view_id), | 42 render_view_id(render_view_id), |
41 permission_bits(permission_bits), | 43 permission_bits(permission_bits), |
42 uses_irt(uses_irt), | 44 uses_irt(uses_irt), |
43 uses_nonsfi_mode(uses_nonsfi_mode), | 45 uses_nonsfi_mode(uses_nonsfi_mode), |
44 enable_dyncode_syscalls(enable_dyncode_syscalls), | 46 enable_dyncode_syscalls(enable_dyncode_syscalls), |
45 enable_exception_handling(enable_exception_handling), | 47 enable_exception_handling(enable_exception_handling), |
46 enable_crash_throttling(enable_crash_throttling) { | 48 enable_crash_throttling(enable_crash_throttling) { |
47 } | 49 } |
48 | 50 |
49 NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { | 51 NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { |
| 52 document_url = l.document_url; |
50 manifest_url = l.manifest_url; | 53 manifest_url = l.manifest_url; |
51 render_view_id = l.render_view_id; | 54 render_view_id = l.render_view_id; |
52 permission_bits = l.permission_bits; | 55 permission_bits = l.permission_bits; |
53 uses_irt = l.uses_irt; | 56 uses_irt = l.uses_irt; |
54 enable_dyncode_syscalls = l.enable_dyncode_syscalls; | 57 enable_dyncode_syscalls = l.enable_dyncode_syscalls; |
55 enable_exception_handling = l.enable_exception_handling; | 58 enable_exception_handling = l.enable_exception_handling; |
56 enable_crash_throttling = l.enable_crash_throttling; | 59 enable_crash_throttling = l.enable_crash_throttling; |
57 } | 60 } |
58 | 61 |
59 NaClLaunchParams::~NaClLaunchParams() { | 62 NaClLaunchParams::~NaClLaunchParams() { |
(...skipping 19 matching lines...) Expand all Loading... |
79 trusted_ipc_channel_handle(trusted_ipc_channel_handle), | 82 trusted_ipc_channel_handle(trusted_ipc_channel_handle), |
80 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle), | 83 manifest_service_ipc_channel_handle(manifest_service_ipc_channel_handle), |
81 plugin_pid(plugin_pid), | 84 plugin_pid(plugin_pid), |
82 plugin_child_id(plugin_child_id) { | 85 plugin_child_id(plugin_child_id) { |
83 } | 86 } |
84 | 87 |
85 NaClLaunchResult::~NaClLaunchResult() { | 88 NaClLaunchResult::~NaClLaunchResult() { |
86 } | 89 } |
87 | 90 |
88 } // namespace nacl | 91 } // namespace nacl |
OLD | NEW |