Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: ppapi/c/private/ppp_content_decryptor_private.h

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + Android compile changes Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/api/private/ppp_content_decryptor_private.idl ('k') | ppapi/cpp/private/content_decryptor_private.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a7c15b46b4c2cde7829aaa8ffdd8125f5d96e44b..c8fe4eeb8222df0701a07e754b8d3bdb2371b10e 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 Thu Mar 19 16:02:53 2015.
+ * modified Fri Apr 24 13:08:50 2015.
*/
#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_14 \
- "PPP_ContentDecryptor_Private;0.14"
+#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_15 \
+ "PPP_ContentDecryptor_Private;0.15"
#define PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE \
- PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_14
+ PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE_0_15
/**
* @file
@@ -42,10 +42,13 @@
* Decryption Module (CDM) for Encrypted Media Extensions:
* http://www.w3.org/TR/encrypted-media/
*/
-struct PPP_ContentDecryptor_Private_0_14 {
+struct PPP_ContentDecryptor_Private_0_15 {
/**
* Initialize for the specified key system.
*
+ * @param[in] promise_id A reference for the promise that gets resolved or
+ * rejected depending upon the success or failure of initialization.
+ *
* @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] allow_distinctive_identifier Inform the CDM that it may use a
@@ -54,6 +57,7 @@ struct PPP_ContentDecryptor_Private_0_14 {
* state.
*/
void (*Initialize)(PP_Instance instance,
+ uint32_t promise_id,
struct PP_Var key_system,
PP_Bool allow_distinctive_identifier,
PP_Bool allow_persistent_state);
@@ -301,7 +305,7 @@ struct PPP_ContentDecryptor_Private_0_14 {
const struct PP_EncryptedBlockInfo* encrypted_block_info);
};
-typedef struct PPP_ContentDecryptor_Private_0_14 PPP_ContentDecryptor_Private;
+typedef struct PPP_ContentDecryptor_Private_0_15 PPP_ContentDecryptor_Private;
/**
* @}
*/
« no previous file with comments | « ppapi/api/private/ppp_content_decryptor_private.idl ('k') | ppapi/cpp/private/content_decryptor_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698