From a267ff14ffc271d52522affde71803bd29bca3e3 Mon Sep 17 00:00:00 2001 From: "jrummell@chromium.org" Date: Tue, 10 Dec 2013 07:25:54 +0000 Subject: Rename EME WD call parameters Rename parameters on EME WD calls to be consistent. BUG=224786 TEST=compiles Review URL: https://codereview.chromium.org/105383002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239698 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/c/private/ppb_content_decryptor_private.h | 22 +++++++++++----------- ppapi/c/private/ppp_content_decryptor_private.h | 14 +++++++------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'ppapi/c') diff --git a/ppapi/c/private/ppb_content_decryptor_private.h b/ppapi/c/private/ppb_content_decryptor_private.h index 18fa715..58492a0 100644 --- a/ppapi/c/private/ppb_content_decryptor_private.h +++ b/ppapi/c/private/ppb_content_decryptor_private.h @@ -4,7 +4,7 @@ */ /* From private/ppb_content_decryptor_private.idl, - * modified Wed Nov 27 14:10:24 2013. + * modified Fri Dec 6 12:16:22 2013. */ #ifndef PPAPI_C_PRIVATE_PPB_CONTENT_DECRYPTOR_PRIVATE_H_ @@ -46,7 +46,7 @@ struct PPB_ContentDecryptor_Private_0_9 { /** * A session has been created by the CDM. * - * @param[in] reference_id A reference for the session for which the CDM + * @param[in] session_id Identifies the session for which the CDM * created a session. * * @param[in] web_session_id A PP_Var of type @@ -55,7 +55,7 @@ struct PPB_ContentDecryptor_Private_0_9 { * */ void (*SessionCreated)(PP_Instance instance, - uint32_t reference_id, + uint32_t session_id, struct PP_Var web_session_id); /** * A message or request has been generated for key_system in the CDM, and @@ -71,7 +71,7 @@ struct PPB_ContentDecryptor_Private_0_9 { * of UpdateSession() and SessionMessage() calls * required to prepare for decryption. * - * @param[in] reference_id A reference for the session for which the message + * @param[in] session_id Identifies the session for which the message * is intended. * * @param[in] message A PP_Var of type @@ -82,7 +82,7 @@ struct PPB_ContentDecryptor_Private_0_9 { * message. */ void (*SessionMessage)(PP_Instance instance, - uint32_t reference_id, + uint32_t session_id, struct PP_Var message, struct PP_Var destination_url); /** @@ -97,23 +97,23 @@ struct PPB_ContentDecryptor_Private_0_9 { * The CDM must call SessionReady() when the sequence is * completed, and, in response, the browser must notify the web application. * - * @param[in] reference_id A reference for the session that is ready. + * @param[in] session_id Identifies the session that is ready. */ - void (*SessionReady)(PP_Instance instance, uint32_t reference_id); + void (*SessionReady)(PP_Instance instance, uint32_t session_id); /** * The session has been closed as the result of a call to the * ReleaseSession() method on the * PPP_ContentDecryptor_Private interface, or due to other * factors as determined by the CDM. * - * @param[in] reference_id A reference for the session that is closed. + * @param[in] session_id Identifies the session that is closed. */ - void (*SessionClosed)(PP_Instance instance, uint32_t reference_id); + void (*SessionClosed)(PP_Instance instance, uint32_t session_id); /** * An error occurred in a PPP_ContentDecryptor_Private method, * or within the plugin implementing the interface. * - * @param[in] reference_id A reference for the session for which the error + * @param[in] session_id Identifies the session for which the error * is intended. * * @param[in] media_error A MediaKeyError. @@ -121,7 +121,7 @@ struct PPB_ContentDecryptor_Private_0_9 { * @param[in] system_error A system error code. */ void (*SessionError)(PP_Instance instance, - uint32_t reference_id, + uint32_t session_id, int32_t media_error, int32_t system_code); /** diff --git a/ppapi/c/private/ppp_content_decryptor_private.h b/ppapi/c/private/ppp_content_decryptor_private.h index 1873abc..27d172d 100644 --- a/ppapi/c/private/ppp_content_decryptor_private.h +++ b/ppapi/c/private/ppp_content_decryptor_private.h @@ -4,7 +4,7 @@ */ /* From private/ppp_content_decryptor_private.idl, - * modified Wed Nov 27 15:42:55 2013. + * modified Tue Dec 3 17:05:10 2013. */ #ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_ @@ -60,7 +60,7 @@ struct PPP_ContentDecryptor_Private_0_9 { * browser by the CDM via SessionCreated() on the * PPB_ContentDecryptor_Private interface. * - * @param[in] reference_id A reference for the session for which a session + * @param[in] session_id A reference for the session for which a session * should be generated. * * @param[in] type A PP_Var of type @@ -71,7 +71,7 @@ struct PPP_ContentDecryptor_Private_0_9 { * initialization data. */ void (*CreateSession)(PP_Instance instance, - uint32_t reference_id, + uint32_t session_id, struct PP_Var type, struct PP_Var init_data); /** @@ -86,22 +86,22 @@ struct PPP_ContentDecryptor_Private_0_9 { * PPB_ContentDecryptor_Private interface, and the browser * must notify the web application. * - * @param[in] reference_id A reference for the session to update. + * @param[in] session_id A reference for the session to update. * * @param[in] response A PP_Var of type * PP_VARTYPE_ARRAYBUFFER containing the license or other * message for the given session ID. */ void (*UpdateSession)(PP_Instance instance, - uint32_t reference_id, + uint32_t session_id, struct PP_Var response); /** * Release the specified session and related resources. * - * @param[in] reference_id A reference for the session that should be + * @param[in] session_id A reference for the session that should be * released. */ - void (*ReleaseSession)(PP_Instance instance, uint32_t reference_id); + void (*ReleaseSession)(PP_Instance instance, uint32_t session_id); /** * Decrypts the block and returns the unencrypted block via * DeliverBlock() on the -- cgit v1.1