| 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 #include "components/nacl/renderer/plugin/service_runtime.h" | 7 #include "components/nacl/renderer/plugin/service_runtime.h" |
| 8 | 8 |
| 9 #include <string.h> | 9 #include <string.h> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 pp_instance_, | 35 pp_instance_, |
| 36 PP_FromBool(main_service_runtime_), | 36 PP_FromBool(main_service_runtime_), |
| 37 params.url.c_str(), | 37 params.url.c_str(), |
| 38 ¶ms.file_info, | 38 ¶ms.file_info, |
| 39 PP_FromBool(uses_nonsfi_mode_), | 39 PP_FromBool(uses_nonsfi_mode_), |
| 40 params.process_type, | 40 params.process_type, |
| 41 &translator_channel_, | 41 &translator_channel_, |
| 42 callback.pp_completion_callback()); | 42 callback.pp_completion_callback()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 // TODO(mseaborn): Remove this method, since it is a no-op. | |
| 46 void ServiceRuntime::Shutdown() { | 45 void ServiceRuntime::Shutdown() { |
| 46 nacl::PPBNaClPrivate::TerminateNaClLoader(pp_instance_); |
| 47 } | 47 } |
| 48 | 48 |
| 49 ServiceRuntime::~ServiceRuntime() { | 49 ServiceRuntime::~ServiceRuntime() { |
| 50 Shutdown(); |
| 50 } | 51 } |
| 51 | 52 |
| 52 } // namespace plugin | 53 } // namespace plugin |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2562113003:
NaCl plugin: Make ServiceRuntime::Shutdown() kill the NaCl loader (Closed)
