OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. |
3 * Use of this source code is governed by a BSD-style license that can be | 3 * Use of this source code is governed by a BSD-style license that can be |
4 * found in the LICENSE file. | 4 * found in the LICENSE file. |
5 */ | 5 */ |
6 | 6 |
7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" | 7 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime" |
8 | 8 |
9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" | 9 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h" |
10 | 10 |
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
610 PP_NACL_ERROR_SEL_LDR_CREATE_LAUNCHER, | 610 PP_NACL_ERROR_SEL_LDR_CREATE_LAUNCHER, |
611 "ServiceRuntime: failed to create sel_ldr launcher"); | 611 "ServiceRuntime: failed to create sel_ldr launcher"); |
612 plugin_->ReportLoadError(error_info); | 612 plugin_->ReportLoadError(error_info); |
613 } | 613 } |
614 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); | 614 pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED); |
615 return; | 615 return; |
616 } | 616 } |
617 | 617 |
618 ManifestService* manifest_service = | 618 ManifestService* manifest_service = |
619 new ManifestService(anchor_->Ref(), rev_interface_); | 619 new ManifestService(anchor_->Ref(), rev_interface_); |
| 620 bool enable_dev_interfaces = |
| 621 GetNaClInterface()->DevInterfacesEnabled(plugin_->pp_instance()); |
| 622 |
620 tmp_subprocess->Start(plugin_->pp_instance(), | 623 tmp_subprocess->Start(plugin_->pp_instance(), |
621 main_service_runtime_, | 624 main_service_runtime_, |
622 params.url.c_str(), | 625 params.url.c_str(), |
623 params.uses_irt, | 626 params.uses_irt, |
624 params.uses_ppapi, | 627 params.uses_ppapi, |
625 params.uses_nonsfi_mode, | 628 params.uses_nonsfi_mode, |
626 params.enable_dev_interfaces, | 629 enable_dev_interfaces, |
627 params.enable_dyncode_syscalls, | 630 params.enable_dyncode_syscalls, |
628 params.enable_exception_handling, | 631 params.enable_exception_handling, |
629 params.enable_crash_throttling, | 632 params.enable_crash_throttling, |
630 &kManifestServiceVTable, | 633 &kManifestServiceVTable, |
631 manifest_service, | 634 manifest_service, |
632 callback); | 635 callback); |
633 subprocess_.reset(tmp_subprocess.release()); | 636 subprocess_.reset(tmp_subprocess.release()); |
634 } | 637 } |
635 | 638 |
636 bool ServiceRuntime::WaitForSelLdrStart() { | 639 bool ServiceRuntime::WaitForSelLdrStart() { |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
794 | 797 |
795 nacl::string ServiceRuntime::GetCrashLogOutput() { | 798 nacl::string ServiceRuntime::GetCrashLogOutput() { |
796 if (NULL != subprocess_.get()) { | 799 if (NULL != subprocess_.get()) { |
797 return subprocess_->GetCrashLogOutput(); | 800 return subprocess_->GetCrashLogOutput(); |
798 } else { | 801 } else { |
799 return std::string(); | 802 return std::string(); |
800 } | 803 } |
801 } | 804 } |
802 | 805 |
803 } // namespace plugin | 806 } // namespace plugin |
OLD | NEW |