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

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.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
« no previous file with comments | « components/nacl/renderer/nexe_load_manager.cc ('k') | components/nacl/renderer/trusted_plugin_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 73c6c66893c40823a69da97ac53c36ed41620372..44af080991f80e15921c36f8a64b94ae23d69183 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -406,10 +406,13 @@ void LaunchSelLdr(PP_Instance instance,
// Create the trusted plugin channel.
if (IsValidChannelHandle(launch_result.trusted_ipc_channel_handle)) {
+ bool report_exit_status = PP_ToBool(main_service_runtime);
scoped_ptr<TrustedPluginChannel> trusted_plugin_channel(
new TrustedPluginChannel(
+ load_manager,
launch_result.trusted_ipc_channel_handle,
- content::RenderThread::Get()->GetShutdownEvent()));
+ content::RenderThread::Get()->GetShutdownEvent(),
+ report_exit_status));
load_manager->set_trusted_plugin_channel(trusted_plugin_channel.Pass());
} else {
PostPPCompletionCallback(callback, PP_ERROR_FAILED);
@@ -788,21 +791,6 @@ PP_NaClReadyState GetNaClReadyState(PP_Instance instance) {
return PP_NACL_READY_STATE_UNSENT;
}
-int32_t GetExitStatus(PP_Instance instance) {
- NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
- DCHECK(load_manager);
- if (load_manager)
- return load_manager->exit_status();
- return -1;
-}
-
-void SetExitStatus(PP_Instance instance, int32_t exit_status) {
- NexeLoadManager* load_manager = NexeLoadManager::Get(instance);
- DCHECK(load_manager);
- if (load_manager)
- return load_manager->set_exit_status(exit_status);
-}
-
void Vlog(const char* message) {
VLOG(1) << message;
}
@@ -1703,8 +1691,6 @@ const PPB_NaCl_Private nacl_interface = {
&GetSandboxArch,
&LogToConsole,
&GetNaClReadyState,
- &GetExitStatus,
- &SetExitStatus,
&Vlog,
&InitializePlugin,
&GetNexeSize,
« no previous file with comments | « components/nacl/renderer/nexe_load_manager.cc ('k') | components/nacl/renderer/trusted_plugin_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698