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 #ifdef _MSC_VER | 5 #ifdef _MSC_VER |
6 // Do not warn about use of std::copy with raw pointers. | 6 // Do not warn about use of std::copy with raw pointers. |
7 #pragma warning(disable : 4996) | 7 #pragma warning(disable : 4996) |
8 #endif | 8 #endif |
9 | 9 |
10 #include "native_client/src/trusted/plugin/plugin.h" | 10 #include "native_client/src/trusted/plugin/plugin.h" |
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 | 592 |
593 bool Plugin::LoadNaClModuleContinuationIntern(ErrorInfo* error_info) { | 593 bool Plugin::LoadNaClModuleContinuationIntern(ErrorInfo* error_info) { |
594 if (!main_subprocess_.StartSrpcServices()) { | 594 if (!main_subprocess_.StartSrpcServices()) { |
595 error_info->SetReport(ERROR_SRPC_CONNECTION_FAIL, | 595 error_info->SetReport(ERROR_SRPC_CONNECTION_FAIL, |
596 "SRPC connection failure for " + | 596 "SRPC connection failure for " + |
597 main_subprocess_.description()); | 597 main_subprocess_.description()); |
598 return false; | 598 return false; |
599 } | 599 } |
600 // Try to start the Chrome IPC-based proxy first. If that fails, we | 600 // Try to start the Chrome IPC-based proxy first. If that fails, we |
601 // must be using the SRPC proxy. | 601 // must be using the SRPC proxy. |
602 if (!nacl_interface_->StartPpapiProxy(pp_instance()) && | 602 if (!nacl_interface_->StartPpapiProxy(pp_instance(), |
| 603 enable_dev_interfaces_) && |
603 !main_subprocess_.StartJSObjectProxy(this, error_info)) { | 604 !main_subprocess_.StartJSObjectProxy(this, error_info)) { |
604 return false; | 605 return false; |
605 } | 606 } |
606 PLUGIN_PRINTF(("Plugin::LoadNaClModule (%s)\n", | 607 PLUGIN_PRINTF(("Plugin::LoadNaClModule (%s)\n", |
607 main_subprocess_.detailed_description().c_str())); | 608 main_subprocess_.detailed_description().c_str())); |
608 return true; | 609 return true; |
609 } | 610 } |
610 | 611 |
611 NaClSubprocess* Plugin::LoadHelperNaClModule(nacl::DescWrapper* wrapper, | 612 NaClSubprocess* Plugin::LoadHelperNaClModule(nacl::DescWrapper* wrapper, |
612 const Manifest* manifest, | 613 const Manifest* manifest, |
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1885 static_cast<uint32_t>(text.size())); | 1886 static_cast<uint32_t>(text.size())); |
1886 const PPB_Console_Dev* console_interface = | 1887 const PPB_Console_Dev* console_interface = |
1887 static_cast<const PPB_Console_Dev*>( | 1888 static_cast<const PPB_Console_Dev*>( |
1888 module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE)); | 1889 module->GetBrowserInterface(PPB_CONSOLE_DEV_INTERFACE)); |
1889 console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str); | 1890 console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str); |
1890 var_interface->Release(prefix); | 1891 var_interface->Release(prefix); |
1891 var_interface->Release(str); | 1892 var_interface->Release(str); |
1892 } | 1893 } |
1893 | 1894 |
1894 } // namespace plugin | 1895 } // namespace plugin |
OLD | NEW |