| 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 ff224c0c62966dcd3adc96b90a4b38206147220a..69763df251e849176d464a8d785de21dc638cc1a 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 Fri Oct 26 15:36:54 2012.
|
| + * modified Wed Sep 18 16:14:30 2013.
|
| */
|
|
|
| #ifndef PPAPI_C_PRIVATE_PPP_CONTENT_DECRYPTOR_PRIVATE_H_
|
| @@ -18,10 +18,10 @@
|
| #include "ppapi/c/pp_var.h"
|
| #include "ppapi/c/private/pp_content_decryptor.h"
|
|
|
| -#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_6 \
|
| - "PPP_ContentDecryptor_Private;0.6"
|
| +#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_7 \
|
| + "PPP_ContentDecryptor_Private;0.7"
|
| #define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
|
| - PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_6
|
| + PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_7
|
|
|
| /**
|
| * @file
|
| @@ -42,7 +42,20 @@
|
| * Decryption Module (CDM) for v0.1 of the proposed Encrypted Media Extensions:
|
| * http://goo.gl/rbdnR
|
| */
|
| -struct PPP_ContentDecryptor_Private_0_6 {
|
| +struct PPP_ContentDecryptor_Private_0_7 {
|
| + /**
|
| + * Initialize for the specified key system.
|
| + *
|
| + * @param[in] key_system A <code>PP_Var</code> of type
|
| + * <code>PP_VARTYPE_STRING</code> containing the name of the key system.
|
| + *
|
| + * @param[in] can_challenge_platform A <code>PP_Bool</code> that
|
| + * indicates if the underlying host platform can be challenged;
|
| + * i.e., verified as a trusted platform.
|
| + */
|
| + void (*Initialize)(PP_Instance instance,
|
| + struct PP_Var key_system,
|
| + PP_Bool can_challenge_platform);
|
| /**
|
| * Generates a key request. key_system specifies the key or licensing system
|
| * to use. type contains the MIME type of init_data. init_data is a data
|
| @@ -53,9 +66,6 @@ struct PPP_ContentDecryptor_Private_0_6 {
|
| * browser by the CDM via <code>KeyMessage()</code> on the
|
| * <code>PPB_ContentDecryptor_Private</code> interface.
|
| *
|
| - * @param[in] key_system A <code>PP_Var</code> of type
|
| - * <code>PP_VARTYPE_STRING</code> containing the name of the key system.
|
| - *
|
| * @param[in] type A <code>PP_Var</code> of type
|
| * <code>PP_VARTYPE_STRING</code> containing the MIME type for init_data.
|
| *
|
| @@ -64,7 +74,6 @@ struct PPP_ContentDecryptor_Private_0_6 {
|
| * initialization data.
|
| */
|
| void (*GenerateKeyRequest)(PP_Instance instance,
|
| - struct PP_Var key_system,
|
| struct PP_Var type,
|
| struct PP_Var init_data);
|
| /**
|
| @@ -226,7 +235,7 @@ struct PPP_ContentDecryptor_Private_0_6 {
|
| const struct PP_EncryptedBlockInfo* encrypted_block_info);
|
| };
|
|
|
| -typedef struct PPP_ContentDecryptor_Private_0_6 PPP_ContentDecryptor_Private;
|
| +typedef struct PPP_ContentDecryptor_Private_0_7 PPP_ContentDecryptor_Private;
|
| /**
|
| * @}
|
| */
|
|
|