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

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

Issue 222203003: Pepper: Move exit_status to NexeLoadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More build fixes Created 6 years, 9 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 1b735f58a20e47767f017ab86528a9981d2c510e..459d9c6200663d4289cac3aa4680846c171fcaa5 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -582,7 +582,6 @@ Plugin::Plugin(PP_Instance pp_instance)
init_time_(0),
nexe_size_(0),
time_of_last_progress_event_(0),
- exit_status_(-1),
nacl_interface_(NULL),
uma_interface_(this) {
PLUGIN_PRINTF(("Plugin::Plugin (this=%p, pp_instance=%"
@@ -811,13 +810,14 @@ void Plugin::NexeDidCrash(int32_t pp_error) {
" non-PP_OK arg -- SHOULD NOT HAPPEN\n"));
}
PLUGIN_PRINTF(("Plugin::NexeDidCrash: crash event!\n"));
- if (-1 != exit_status()) {
+ int exit_status = nacl_interface_->GetExitStatus(pp_instance());
+ if (exit_status != -1) {
dmichael (off chromium) 2014/04/02 19:01:41 Pardon the stupid question, but is -1 a viable exi
// The NaCl module voluntarily exited. However, this is still a
// crash from the point of view of Pepper, since PPAPI plugins are
// event handlers and should never exit.
PLUGIN_PRINTF((("Plugin::NexeDidCrash: nexe exited with status %d"
" so this is a \"controlled crash\".\n"),
- exit_status()));
+ exit_status));
}
// If the crash occurs during load, we just want to report an error
// that fits into our load progress event grammar. If the crash
@@ -1372,10 +1372,7 @@ void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
int exit_status) {
DCHECK(pp::Module::Get()->core()->IsMainThread());
DCHECK(nacl_interface_);
- exit_status_ = exit_status;
- nacl_interface_->SetReadOnlyProperty(pp_instance(),
- pp::Var("exitStatus").pp_var(),
- pp::Var(exit_status_).pp_var());
+ nacl_interface_->SetExitStatus(pp_instance(), exit_status);
}

Powered by Google App Engine
This is Rietveld 408576698