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

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.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: 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 7d4cdbffd0e80a1485f250cc528e5f611588630f..531b7f1f96b68abd2ca2ae7155a6509e69a27717 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -432,14 +432,6 @@ void DispatchEventOnMainThread(PP_Instance instance,
}
}
-void SetReadOnlyProperty(PP_Instance instance,
- struct PP_Var key,
- struct PP_Var value) {
- nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
- if (load_manager)
- load_manager->SetReadOnlyProperty(key, value);
-}
-
void ReportLoadSuccess(PP_Instance instance,
const char* url,
uint64_t loaded_bytes,
@@ -575,6 +567,21 @@ void SetReadyTime(PP_Instance instance, int64_t ready_time) {
load_manager->set_ready_time(ready_time);
}
+int32_t GetExitStatus(PP_Instance instance) {
+ nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+ DCHECK(load_manager);
+ if (load_manager)
+ return load_manager->exit_status();
+ return -1;
+}
+
+void SetExitStatus(PP_Instance instance, int32_t exit_status) {
+ nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+ DCHECK(load_manager);
+ if (load_manager)
+ return load_manager->set_exit_status(exit_status);
+}
+
const PPB_NaCl_Private nacl_interface = {
&LaunchSelLdr,
&StartPpapiProxy,
@@ -589,7 +596,6 @@ const PPB_NaCl_Private nacl_interface = {
&ReportTranslationFinished,
&OpenNaClExecutable,
&DispatchEvent,
- &SetReadOnlyProperty,
dmichael (off chromium) 2014/04/02 19:01:41 Yay!
&ReportLoadSuccess,
&ReportLoadError,
&ReportLoadAbort,
@@ -606,7 +612,9 @@ const PPB_NaCl_Private nacl_interface = {
&GetIsInstalled,
&SetIsInstalled,
&GetReadyTime,
- &SetReadyTime
+ &SetReadyTime,
+ &GetExitStatus,
+ &SetExitStatus
};
} // namespace

Powered by Google App Engine
This is Rietveld 408576698