Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Unified Diff: ppapi/native_client/src/trusted/plugin/plugin.cc

Issue 484783002: Pepper: Report NaCl exit status over Chromium IPC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ppapi/native_client/src/trusted/plugin/plugin.cc
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index 6104b90188a0c765fe5d2a1db6a59d2c8978ce6b..ea8655852e9ddd57a717557fd772413d3bf6b0af 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -275,9 +275,6 @@ Plugin::Plugin(PP_Instance pp_instance)
// Notify PPB_NaCl_Private that the instance is created before altering any
// state that it tracks.
nacl_interface_->InstanceCreated(pp_instance);
- // We call set_exit_status() here to ensure that the 'exitStatus' property is
- // set. This can only be called when nacl_interface_ is not NULL.
- set_exit_status(-1);
nexe_file_info_ = kInvalidNaClFileInfo;
}
@@ -452,24 +449,4 @@ bool Plugin::DocumentCanRequest(const std::string& url) {
return pp::URLUtil_Dev::Get()->DocumentCanRequest(this, pp::Var(url));
}
-void Plugin::set_exit_status(int exit_status) {
- pp::Core* core = pp::Module::Get()->core();
- if (core->IsMainThread()) {
- SetExitStatusOnMainThread(PP_OK, exit_status);
- } else {
- pp::CompletionCallback callback =
- callback_factory_.NewCallback(&Plugin::SetExitStatusOnMainThread,
- exit_status);
- core->CallOnMainThread(0, callback, 0);
- }
-}
-
-void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
- int exit_status) {
- DCHECK(pp::Module::Get()->core()->IsMainThread());
- DCHECK(nacl_interface_);
- nacl_interface_->SetExitStatus(pp_instance(), exit_status);
-}
-
-
} // namespace plugin
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.h ('k') | ppapi/native_client/src/trusted/plugin/service_runtime.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698