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

Unified Diff: ppapi/cpp/private/content_decryptor_private.cc

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
Index: ppapi/cpp/private/content_decryptor_private.cc
diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc
index d14bd0e82fc5d0d0170dab37df1027d96149329b..f87ef18c95d33e67230a95cb7a47301912c7d8fa 100644
--- a/ppapi/cpp/private/content_decryptor_private.cc
+++ b/ppapi/cpp/private/content_decryptor_private.cc
@@ -25,6 +25,7 @@ static const char kPPPContentDecryptorInterface[] =
PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE;
void Initialize(PP_Instance instance,
+ uint32_t promise_id,
PP_Var key_system_arg,
PP_Bool allow_distinctive_identifier,
PP_Bool allow_persistent_state) {
@@ -37,10 +38,10 @@ void Initialize(PP_Instance instance,
if (!key_system_var.is_string())
return;
- static_cast<ContentDecryptor_Private*>(object)->Initialize(
- key_system_var.AsString(),
- PP_ToBool(allow_distinctive_identifier),
- PP_ToBool(allow_persistent_state));
+ static_cast<ContentDecryptor_Private*>(object)
+ ->Initialize(promise_id, key_system_var.AsString(),
+ PP_ToBool(allow_distinctive_identifier),
+ PP_ToBool(allow_persistent_state));
}
void SetServerCertificate(PP_Instance instance,
« no previous file with comments | « ppapi/cpp/private/content_decryptor_private.h ('k') | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698