| 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 659 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 670 // determine the nexe URL. | 670 // determine the nexe URL. |
| 671 // Sets src property to full manifest URL. | 671 // Sets src property to full manifest URL. |
| 672 RequestNaClManifest(manifest_url); | 672 RequestNaClManifest(manifest_url); |
| 673 } | 673 } |
| 674 } | 674 } |
| 675 | 675 |
| 676 PLUGIN_PRINTF(("Plugin::Init (status=%d)\n", status)); | 676 PLUGIN_PRINTF(("Plugin::Init (status=%d)\n", status)); |
| 677 return status; | 677 return status; |
| 678 } | 678 } |
| 679 | 679 |
| 680 | |
| 681 Plugin::Plugin(PP_Instance pp_instance) | 680 Plugin::Plugin(PP_Instance pp_instance) |
| 682 : pp::InstancePrivate(pp_instance), | 681 : pp::InstancePrivate(pp_instance), |
| 683 scriptable_plugin_(NULL), | 682 scriptable_plugin_(NULL), |
| 684 argc_(-1), | 683 argc_(-1), |
| 685 argn_(NULL), | 684 argn_(NULL), |
| 686 argv_(NULL), | 685 argv_(NULL), |
| 687 main_subprocess_("main subprocess", NULL, NULL), | 686 main_subprocess_("main subprocess", NULL, NULL), |
| 688 nacl_ready_state_(UNSENT), | 687 nacl_ready_state_(UNSENT), |
| 689 nexe_error_reported_(false), | 688 nexe_error_reported_(false), |
| 690 wrapper_factory_(NULL), | 689 wrapper_factory_(NULL), |
| 691 last_error_string_(""), | |
| 692 enable_dev_interfaces_(false), | 690 enable_dev_interfaces_(false), |
| 693 is_installed_(false), | 691 is_installed_(false), |
| 694 init_time_(0), | 692 init_time_(0), |
| 695 ready_time_(0), | 693 ready_time_(0), |
| 696 nexe_size_(0), | 694 nexe_size_(0), |
| 697 time_of_last_progress_event_(0), | 695 time_of_last_progress_event_(0), |
| 698 nacl_interface_(NULL) { | 696 nacl_interface_(NULL) { |
| 699 PLUGIN_PRINTF(("Plugin::Plugin (this=%p, pp_instance=%" | 697 PLUGIN_PRINTF(("Plugin::Plugin (this=%p, pp_instance=%" |
| 700 NACL_PRId32")\n", static_cast<void*>(this), pp_instance)); | 698 NACL_PRId32")\n", static_cast<void*>(this), pp_instance)); |
| 701 callback_factory_.Initialize(this); | 699 callback_factory_.Initialize(this); |
| (...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1624 static_cast<uint32_t>(text.size())); | 1622 static_cast<uint32_t>(text.size())); |
| 1625 const PPB_Console* console_interface = | 1623 const PPB_Console* console_interface = |
| 1626 static_cast<const PPB_Console*>( | 1624 static_cast<const PPB_Console*>( |
| 1627 module->GetBrowserInterface(PPB_CONSOLE_INTERFACE)); | 1625 module->GetBrowserInterface(PPB_CONSOLE_INTERFACE)); |
| 1628 console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str); | 1626 console_interface->LogWithSource(pp_instance(), PP_LOGLEVEL_LOG, prefix, str); |
| 1629 var_interface->Release(prefix); | 1627 var_interface->Release(prefix); |
| 1630 var_interface->Release(str); | 1628 var_interface->Release(str); |
| 1631 } | 1629 } |
| 1632 | 1630 |
| 1633 } // namespace plugin | 1631 } // namespace plugin |
| OLD | NEW |