| Index: ppapi/c/private/ppp_content_decryptor_private.h
|
| diff --git a/ppapi/c/private/ppp_content_decryptor_private.h b/ppapi/c/private/ppp_content_decryptor_private.h
|
| index 56b5d856f6472f0396b17f4aaa96894f61a4cf06..eb5cbdb30e7b777dd221f026e6ffe188e6990dbf 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 Tue Aug 14 11:06:05 2012.
|
| + * modified Wed Aug 15 19:53:16 2012.
|
| */
|
|
|
| #ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
|
| @@ -16,6 +16,7 @@
|
| #include "ppapi/c/pp_resource.h"
|
| #include "ppapi/c/pp_stdint.h"
|
| #include "ppapi/c/pp_var.h"
|
| +#include "ppapi/c/private/pp_decrypt_config.h"
|
|
|
| #define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_1 \
|
| "PPP_ContentDecryptor_Private;0.1"
|
| @@ -100,13 +101,13 @@ struct PPP_ContentDecryptor_Private_0_1 {
|
| * <code>PPB_Buffer_Dev</code> resource that contains an encrypted data
|
| * block.
|
| *
|
| - * @param[in] request_id A value used by the browser to associate data
|
| - * returned via the <code>PPB_ContentDecryptor_Private</code> interface with
|
| - * decryption method calls.
|
| + * @param[in] decrypt_config A <code>PP_DecryptConfig</code> that contains
|
| + * all auxiliary information needed for decryption of the
|
| + * <code>encrypted_block</code>.
|
| */
|
| PP_Bool (*Decrypt)(PP_Instance instance,
|
| PP_Resource encrypted_block,
|
| - int32_t request_id);
|
| + const struct PP_DecryptConfig* decrypt_config);
|
| /**
|
| * Decrypts the block, decodes it, and returns the unencrypted uncompressed
|
| * (decoded) media to the browser via the
|
| @@ -120,13 +121,13 @@ struct PPP_ContentDecryptor_Private_0_1 {
|
| * <code>PPB_Buffer_Dev</code> resource that contains an encrypted data
|
| * block.
|
| *
|
| - * @param[in] request_id A value used by the browser to associate data
|
| - * returned via the <code>PPB_ContentDecryptor_Private</code> interface with
|
| - * decryption method calls.
|
| + * @param[in] decrypt_config A <code>PP_DecryptConfig</code> that contains
|
| + * all auxiliary information needed for decryption of the
|
| + * <code>encrypted_block</code>.
|
| */
|
| PP_Bool (*DecryptAndDecode)(PP_Instance instance,
|
| PP_Resource encrypted_block,
|
| - int32_t request_id);
|
| + const struct PP_DecryptConfig* decrypt_config);
|
| };
|
|
|
| typedef struct PPP_ContentDecryptor_Private_0_1 PPP_ContentDecryptor_Private;
|
|
|