OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/browser/nacl_process_host.h" | 5 #include "components/nacl/browser/nacl_process_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
705 params.validation_cache_enabled = nacl_browser->ValidationCacheIsEnabled(); | 705 params.validation_cache_enabled = nacl_browser->ValidationCacheIsEnabled(); |
706 params.validation_cache_key = nacl_browser->GetValidationCacheKey(); | 706 params.validation_cache_key = nacl_browser->GetValidationCacheKey(); |
707 params.version = NaClBrowser::GetDelegate()->GetVersionString(); | 707 params.version = NaClBrowser::GetDelegate()->GetVersionString(); |
708 params.enable_exception_handling = enable_exception_handling_; | 708 params.enable_exception_handling = enable_exception_handling_; |
709 params.enable_debug_stub = enable_debug_stub_ && | 709 params.enable_debug_stub = enable_debug_stub_ && |
710 NaClBrowser::GetDelegate()->URLMatchesDebugPatterns(manifest_url_); | 710 NaClBrowser::GetDelegate()->URLMatchesDebugPatterns(manifest_url_); |
711 // Enable PPAPI proxy channel creation only for renderer processes. | 711 // Enable PPAPI proxy channel creation only for renderer processes. |
712 params.enable_ipc_proxy = enable_ppapi_proxy(); | 712 params.enable_ipc_proxy = enable_ppapi_proxy(); |
713 params.uses_irt = uses_irt_; | 713 params.uses_irt = uses_irt_; |
714 params.enable_dyncode_syscalls = enable_dyncode_syscalls_; | 714 params.enable_dyncode_syscalls = enable_dyncode_syscalls_; |
| 715 params.enable_nonsfi_mode = CommandLine::ForCurrentProcess()->HasSwitch( |
| 716 switches::kEnableNaClNonSfiMode); |
715 | 717 |
716 const ChildProcessData& data = process_->GetData(); | 718 const ChildProcessData& data = process_->GetData(); |
717 if (!ShareHandleToSelLdr(data.handle, | 719 if (!ShareHandleToSelLdr(data.handle, |
718 internal_->socket_for_sel_ldr, true, | 720 internal_->socket_for_sel_ldr, true, |
719 ¶ms.handles)) { | 721 ¶ms.handles)) { |
720 return false; | 722 return false; |
721 } | 723 } |
722 | 724 |
723 if (params.uses_irt) { | 725 if (params.uses_irt) { |
724 base::PlatformFile irt_file = nacl_browser->IrtFile(); | 726 base::PlatformFile irt_file = nacl_browser->IrtFile(); |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1020 process_handle.Take(), info, | 1022 process_handle.Take(), info, |
1021 base::MessageLoopProxy::current(), | 1023 base::MessageLoopProxy::current(), |
1022 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, | 1024 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, |
1023 weak_factory_.GetWeakPtr())); | 1025 weak_factory_.GetWeakPtr())); |
1024 return true; | 1026 return true; |
1025 } | 1027 } |
1026 } | 1028 } |
1027 #endif | 1029 #endif |
1028 | 1030 |
1029 } // namespace nacl | 1031 } // namespace nacl |
OLD | NEW |