diff options
| -rw-r--r-- | components/nacl/renderer/ppb_nacl_private_impl.cc | 12 | ||||
| -rw-r--r-- | ppapi/api/private/ppb_nacl_private.idl | 5 | ||||
| -rw-r--r-- | ppapi/c/private/ppb_nacl_private.h | 6 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c | 6 |
4 files changed, 1 insertions, 28 deletions
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc index 463cd07..19fcf26 100644 --- a/components/nacl/renderer/ppb_nacl_private_impl.cc +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc @@ -776,17 +776,6 @@ void DispatchEvent(PP_Instance instance, DispatchProgressEvent(instance, event); } -void ReportLoadSuccess(PP_Instance instance, - uint64_t loaded_bytes, - uint64_t total_bytes) { - NexeLoadManager* load_manager = GetNexeLoadManager(instance); - if (load_manager) { - load_manager->ReportLoadSuccess(load_manager->program_url(), - loaded_bytes, - total_bytes); - } -} - void ReportLoadError(PP_Instance instance, PP_NaClError error, const char* error_message) { @@ -1689,7 +1678,6 @@ const PPB_NaCl_Private nacl_interface = { &GetNumberOfProcessors, &ReportTranslationFinished, &DispatchEvent, - &ReportLoadSuccess, &ReportLoadError, &InstanceCreated, &InstanceDestroyed, diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl index fd6a7c7..cf7652a 100644 --- a/ppapi/api/private/ppb_nacl_private.idl +++ b/ppapi/api/private/ppb_nacl_private.idl @@ -243,11 +243,6 @@ interface PPB_NaCl_Private { [in] uint64_t loaded_bytes, [in] uint64_t total_bytes); - /* Report that the nexe loaded successfully. */ - void ReportLoadSuccess([in] PP_Instance instance, - [in] uint64_t loaded_bytes, - [in] uint64_t total_bytes); - /* Report an error that occured while attempting to load a nexe. */ void ReportLoadError([in] PP_Instance instance, [in] PP_NaClError error, diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h index d9fcd5f..6c83cd6 100644 --- a/ppapi/c/private/ppb_nacl_private.h +++ b/ppapi/c/private/ppb_nacl_private.h @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -/* From private/ppb_nacl_private.idl modified Thu Jan 22 07:26:18 2015. */ +/* From private/ppb_nacl_private.idl modified Thu Jan 22 15:56:12 2015. */ #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ @@ -278,10 +278,6 @@ struct PPB_NaCl_Private_1_0 { PP_Bool length_is_computable, uint64_t loaded_bytes, uint64_t total_bytes); - /* Report that the nexe loaded successfully. */ - void (*ReportLoadSuccess)(PP_Instance instance, - uint64_t loaded_bytes, - uint64_t total_bytes); /* Report an error that occured while attempting to load a nexe. */ void (*ReportLoadError)(PP_Instance instance, PP_NaClError error, diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c index c4cde22..da97a45 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c @@ -3640,11 +3640,6 @@ static void Pnacl_M25_PPB_NaCl_Private_DispatchEvent(PP_Instance instance, PP_Na iface->DispatchEvent(instance, event_type, resource_url, length_is_computable, loaded_bytes, total_bytes); } -static void Pnacl_M25_PPB_NaCl_Private_ReportLoadSuccess(PP_Instance instance, uint64_t loaded_bytes, uint64_t total_bytes) { - const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_1_0.real_iface; - iface->ReportLoadSuccess(instance, loaded_bytes, total_bytes); -} - static void Pnacl_M25_PPB_NaCl_Private_ReportLoadError(PP_Instance instance, PP_NaClError error, const char* error_message) { const struct PPB_NaCl_Private_1_0 *iface = Pnacl_WrapperInfo_PPB_NaCl_Private_1_0.real_iface; iface->ReportLoadError(instance, error, error_message); @@ -5605,7 +5600,6 @@ static const struct PPB_NaCl_Private_1_0 Pnacl_Wrappers_PPB_NaCl_Private_1_0 = { .GetNumberOfProcessors = (int32_t (*)(void))&Pnacl_M25_PPB_NaCl_Private_GetNumberOfProcessors, .ReportTranslationFinished = (void (*)(PP_Instance instance, PP_Bool success, int32_t opt_level, int64_t pexe_size, int64_t compile_time_us))&Pnacl_M25_PPB_NaCl_Private_ReportTranslationFinished, .DispatchEvent = (void (*)(PP_Instance instance, PP_NaClEventType event_type, const char* resource_url, PP_Bool length_is_computable, uint64_t loaded_bytes, uint64_t total_bytes))&Pnacl_M25_PPB_NaCl_Private_DispatchEvent, - .ReportLoadSuccess = (void (*)(PP_Instance instance, uint64_t loaded_bytes, uint64_t total_bytes))&Pnacl_M25_PPB_NaCl_Private_ReportLoadSuccess, .ReportLoadError = (void (*)(PP_Instance instance, PP_NaClError error, const char* error_message))&Pnacl_M25_PPB_NaCl_Private_ReportLoadError, .InstanceCreated = (void (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Private_InstanceCreated, .InstanceDestroyed = (void (*)(PP_Instance instance))&Pnacl_M25_PPB_NaCl_Private_InstanceDestroyed, |