Changes to support CDM_7

ppapi/c/private/pp_content_decryptor.h

Index: ppapi/c/private/pp_content_decryptor.h
diff --git a/ppapi/c/private/pp_content_decryptor.h b/ppapi/c/private/pp_content_decryptor.h
index 971d2a0b619b37772698b4d870467de9e797e199..11959e186ee8d767efebce40aa5d0187629155f1 100644
--- a/ppapi/c/private/pp_content_decryptor.h
+++ b/ppapi/c/private/pp_content_decryptor.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From private/pp_content_decryptor.idl modified Thu Jun  5 13:39:15 2014. */
+/* From private/pp_content_decryptor.idl modified Tue Dec 16 14:34:48 2014. */
 
 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
@@ -455,7 +455,8 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptorStreamType, 4);
  */
 typedef enum {
   PP_SESSIONTYPE_TEMPORARY = 0,
-  PP_SESSIONTYPE_PERSISTENT = 1
+  PP_SESSIONTYPE_PERSISTENT_LICENSE = 1,
+  PP_SESSIONTYPE_PERSISTENT_RELEASE = 2
 } PP_SessionType;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_SessionType, 4);
 
@@ -472,6 +473,55 @@ typedef enum {
   PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7
 } PP_CdmExceptionCode;
 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4);
+
+/**
+ * <code>PP_MessageType</code> contains message type constants.
+ */
+typedef enum {
+  PP_MESSAGETYPE_LICENSE_REQUEST = 0,
+  PP_MESSAGETYPE_LICENSE_RENEWAL = 1,
+  PP_MESSAGETYPE_LICENSE_RELEASE = 2
+} PP_MessageType;

[dmichael (off chromium), 2014/12/19 18:50:04]

Could you do a slightly more specific name, like PP_CDM_MessageType?

[jrummell, 2014/12/20 00:23:08]

Done.

+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_MessageType, 4);
+
+/**
+ * <code>PP_KeyStatus</code> contains key status constants.
+ */
+typedef enum {
+  PP_KEYSTATUS_USABLE = 0,
+  PP_KEYSTATUS_INVALID = 1,
+  PP_KEYSTATUS_EXPIRED = 2,
+  PP_KEYSTATUS_OUTPUTNOTALLOWED = 3
+} PP_KeyStatus;

[dmichael (off chromium), 2014/12/19 18:50:04]

ditto

[jrummell, 2014/12/20 00:23:08]

Done.

+PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_KeyStatus, 4);
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup Structs
+ * @{
+ */
+/**
+ * The <code>PP_KeyInformation</code> struct contains information about a
+ * key used for decryption.
+ */
+struct PP_KeyInformation {
+  /**
+   * Key ID.
+   */
+  uint8_t key_id[512];
+  uint32_t key_id_size;
+  /**
+   * Status of this key.
+   */
+  PP_KeyStatus key_status;
+  /**
+   * Optional error code for keys that are not usable.
+   */
+  uint32_t system_code;
+};
+PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
 /**
  * @}
  */