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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 } | 389 } |
390 | 390 |
391 bool enable_dev_interfaces = | 391 bool enable_dev_interfaces = |
392 GetNaClInterface()->DevInterfacesEnabled(pp_instance_); | 392 GetNaClInterface()->DevInterfacesEnabled(pp_instance_); |
393 | 393 |
394 GetNaClInterface()->LaunchSelLdr( | 394 GetNaClInterface()->LaunchSelLdr( |
395 pp_instance_, | 395 pp_instance_, |
396 PP_FromBool(main_service_runtime_), | 396 PP_FromBool(main_service_runtime_), |
397 params.url.c_str(), | 397 params.url.c_str(), |
398 ¶ms.file_info, | 398 ¶ms.file_info, |
| 399 params.resource_file_handles, |
399 PP_FromBool(uses_nonsfi_mode_), | 400 PP_FromBool(uses_nonsfi_mode_), |
400 PP_FromBool(enable_dev_interfaces), | 401 PP_FromBool(enable_dev_interfaces), |
401 params.process_type, | 402 params.process_type, |
402 &bootstrap_channel_, | 403 &bootstrap_channel_, |
403 callback.pp_completion_callback()); | 404 callback.pp_completion_callback()); |
404 subprocess_.reset(tmp_subprocess.release()); | 405 subprocess_.reset(tmp_subprocess.release()); |
405 } | 406 } |
406 | 407 |
407 bool ServiceRuntime::WaitForSelLdrStart() { | 408 bool ServiceRuntime::WaitForSelLdrStart() { |
408 // Time to wait on condvar (for browser to create a new sel_ldr process on | 409 // Time to wait on condvar (for browser to create a new sel_ldr process on |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
557 reverse_service_->Unref(); | 558 reverse_service_->Unref(); |
558 | 559 |
559 rev_interface_->Unref(); | 560 rev_interface_->Unref(); |
560 | 561 |
561 anchor_->Unref(); | 562 anchor_->Unref(); |
562 NaClCondVarDtor(&cond_); | 563 NaClCondVarDtor(&cond_); |
563 NaClMutexDtor(&mu_); | 564 NaClMutexDtor(&mu_); |
564 } | 565 } |
565 | 566 |
566 } // namespace plugin | 567 } // namespace plugin |
OLD | NEW |