| 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 684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 695 ManifestService* manifest_service = | 695 ManifestService* manifest_service = |
| 696 new ManifestService(anchor_->Ref(), rev_interface_); | 696 new ManifestService(anchor_->Ref(), rev_interface_); |
| 697 bool enable_dev_interfaces = | 697 bool enable_dev_interfaces = |
| 698 GetNaClInterface()->DevInterfacesEnabled(plugin_->pp_instance()); | 698 GetNaClInterface()->DevInterfacesEnabled(plugin_->pp_instance()); |
| 699 | 699 |
| 700 tmp_subprocess->Start(plugin_->pp_instance(), | 700 tmp_subprocess->Start(plugin_->pp_instance(), |
| 701 main_service_runtime_, | 701 main_service_runtime_, |
| 702 params.url.c_str(), | 702 params.url.c_str(), |
| 703 params.uses_irt, | 703 params.uses_irt, |
| 704 params.uses_ppapi, | 704 params.uses_ppapi, |
| 705 params.uses_nonsfi_mode, | 705 uses_nonsfi_mode_, |
| 706 enable_dev_interfaces, | 706 enable_dev_interfaces, |
| 707 params.enable_dyncode_syscalls, | 707 params.enable_dyncode_syscalls, |
| 708 params.enable_exception_handling, | 708 params.enable_exception_handling, |
| 709 params.enable_crash_throttling, | 709 params.enable_crash_throttling, |
| 710 &kManifestServiceVTable, | 710 &kManifestServiceVTable, |
| 711 manifest_service, | 711 manifest_service, |
| 712 callback); | 712 callback); |
| 713 subprocess_.reset(tmp_subprocess.release()); | 713 subprocess_.reset(tmp_subprocess.release()); |
| 714 } | 714 } |
| 715 | 715 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 859 | 859 |
| 860 nacl::string ServiceRuntime::GetCrashLogOutput() { | 860 nacl::string ServiceRuntime::GetCrashLogOutput() { |
| 861 if (NULL != subprocess_.get()) { | 861 if (NULL != subprocess_.get()) { |
| 862 return subprocess_->GetCrashLogOutput(); | 862 return subprocess_->GetCrashLogOutput(); |
| 863 } else { | 863 } else { |
| 864 return std::string(); | 864 return std::string(); |
| 865 } | 865 } |
| 866 } | 866 } |
| 867 | 867 |
| 868 } // namespace plugin | 868 } // namespace plugin |
| OLD | NEW |