| 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 17 matching lines...) Expand all Loading... |
| 28 enable_exception_handling(false), | 28 enable_exception_handling(false), |
| 29 enable_crash_throttling(false) { | 29 enable_crash_throttling(false) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, | 32 NaClLaunchParams::NaClLaunchParams(const std::string& manifest_url, |
| 33 int render_view_id, | 33 int render_view_id, |
| 34 uint32 permission_bits, | 34 uint32 permission_bits, |
| 35 bool uses_irt, | 35 bool uses_irt, |
| 36 bool enable_dyncode_syscalls, | 36 bool enable_dyncode_syscalls, |
| 37 bool enable_exception_handling, | 37 bool enable_exception_handling, |
| 38 bool enable_crash_throttling) | 38 bool enable_crash_throttling, |
| 39 bool enable_nonsfi) |
| 39 : manifest_url(manifest_url), | 40 : manifest_url(manifest_url), |
| 40 render_view_id(render_view_id), | 41 render_view_id(render_view_id), |
| 41 permission_bits(permission_bits), | 42 permission_bits(permission_bits), |
| 42 uses_irt(uses_irt), | 43 uses_irt(uses_irt), |
| 43 enable_dyncode_syscalls(enable_dyncode_syscalls), | 44 enable_dyncode_syscalls(enable_dyncode_syscalls), |
| 44 enable_exception_handling(enable_exception_handling), | 45 enable_exception_handling(enable_exception_handling), |
| 45 enable_crash_throttling(enable_crash_throttling) { | 46 enable_crash_throttling(enable_crash_throttling), |
| 47 enable_nonsfi(enable_nonsfi) { |
| 46 } | 48 } |
| 47 | 49 |
| 48 NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { | 50 NaClLaunchParams::NaClLaunchParams(const NaClLaunchParams& l) { |
| 49 manifest_url = l.manifest_url; | 51 manifest_url = l.manifest_url; |
| 50 render_view_id = l.render_view_id; | 52 render_view_id = l.render_view_id; |
| 51 permission_bits = l.permission_bits; | 53 permission_bits = l.permission_bits; |
| 52 uses_irt = l.uses_irt; | 54 uses_irt = l.uses_irt; |
| 53 enable_dyncode_syscalls = l.enable_dyncode_syscalls; | 55 enable_dyncode_syscalls = l.enable_dyncode_syscalls; |
| 54 enable_exception_handling = l.enable_exception_handling; | 56 enable_exception_handling = l.enable_exception_handling; |
| 55 enable_crash_throttling = l.enable_crash_throttling; | 57 enable_crash_throttling = l.enable_crash_throttling; |
| (...skipping 20 matching lines...) Expand all Loading... |
| 76 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), | 78 ppapi_ipc_channel_handle(ppapi_ipc_channel_handle), |
| 77 trusted_ipc_channel_handle(trusted_ipc_channel_handle), | 79 trusted_ipc_channel_handle(trusted_ipc_channel_handle), |
| 78 plugin_pid(plugin_pid), | 80 plugin_pid(plugin_pid), |
| 79 plugin_child_id(plugin_child_id) { | 81 plugin_child_id(plugin_child_id) { |
| 80 } | 82 } |
| 81 | 83 |
| 82 NaClLaunchResult::~NaClLaunchResult() { | 84 NaClLaunchResult::~NaClLaunchResult() { |
| 83 } | 85 } |
| 84 | 86 |
| 85 } // namespace nacl | 87 } // namespace nacl |
| OLD | NEW |