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

Unified Diff: content/renderer/media/crypto/content_decryption_module_factory.cc

Issue 555223004: Update MediaKeys interface for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + Android changes Created 6 years, 3 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: content/renderer/media/crypto/content_decryption_module_factory.cc
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc
index e56962f6811471c77be61e42f005f7cfd9eded02..bba8baf605a72fdb7bd0874a3fe15a1235530c45 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.cc
+++ b/content/renderer/media/crypto/content_decryption_module_factory.cc
@@ -28,6 +28,8 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
int* cdm_id,
#endif // defined(ENABLE_PEPPER_CDMS)
const media::SessionMessageCB& session_message_cb,
+ const media::SessionKeysChangeCB& session_keys_change_cb,
+ const media::SessionExpirationChangeCB& session_expiration_change_cb,
const media::SessionReadyCB& session_ready_cb,
const media::SessionClosedCB& session_closed_cb,
const media::SessionErrorCB& session_error_cb) {
@@ -41,8 +43,8 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
#endif
if (CanUseAesDecryptor(key_system)) {
- return scoped_ptr<media::MediaKeys>(
- new media::AesDecryptor(session_message_cb, session_closed_cb));
+ return scoped_ptr<media::MediaKeys>(new media::AesDecryptor(
+ session_message_cb, session_keys_change_cb, session_closed_cb));
}
#if defined(ENABLE_PEPPER_CDMS)
return scoped_ptr<media::MediaKeys>(
@@ -50,6 +52,8 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(
security_origin,
create_pepper_cdm_cb,
session_message_cb,
+ session_keys_change_cb,
+ session_expiration_change_cb,
session_ready_cb,
session_closed_cb,
session_error_cb));

Powered by Google App Engine
This is Rietveld 408576698