| Index: content/renderer/media/crypto/proxy_decryptor.cc
|
| diff --git a/content/renderer/media/crypto/proxy_decryptor.cc b/content/renderer/media/crypto/proxy_decryptor.cc
|
| index 8a9a757a9046c9150d95f7579429edfbd0e08d2f..377b7ee8af0527efdf128871973edfc75eed0ffc 100644
|
| --- a/content/renderer/media/crypto/proxy_decryptor.cc
|
| +++ b/content/renderer/media/crypto/proxy_decryptor.cc
|
| @@ -218,7 +218,7 @@ void ProxyDecryptor::CancelKeyRequest(const std::string& web_session_id) {
|
| base::Bind(&ProxyDecryptor::OnSessionError,
|
| weak_ptr_factory_.GetWeakPtr(),
|
| web_session_id)));
|
| - media_keys_->ReleaseSession(web_session_id, promise.Pass());
|
| + media_keys_->RemoveSession(web_session_id, promise.Pass());
|
| }
|
|
|
| scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
|
| @@ -240,6 +240,10 @@ scoped_ptr<media::MediaKeys> ProxyDecryptor::CreateMediaKeys(
|
| base::Bind(&ProxyDecryptor::OnSessionClosed,
|
| weak_ptr_factory_.GetWeakPtr()),
|
| base::Bind(&ProxyDecryptor::OnSessionError,
|
| + weak_ptr_factory_.GetWeakPtr()),
|
| + base::Bind(&ProxyDecryptor::OnSessionKeysChange,
|
| + weak_ptr_factory_.GetWeakPtr()),
|
| + base::Bind(&ProxyDecryptor::OnSessionExpirationChange,
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
|
|
| @@ -261,6 +265,17 @@ void ProxyDecryptor::OnSessionMessage(const std::string& web_session_id,
|
| key_message_cb_.Run(web_session_id, message, destination_url);
|
| }
|
|
|
| +void ProxyDecryptor::OnSessionKeysChange(const std::string& web_session_id,
|
| + bool has_additional_usable_key) {
|
| + // EME v0.1b doesn't support this event.
|
| +}
|
| +
|
| +void ProxyDecryptor::OnSessionExpirationChange(
|
| + const std::string& web_session_id,
|
| + double new_expiry_time) {
|
| + // EME v0.1b doesn't support this event.
|
| +}
|
| +
|
| void ProxyDecryptor::OnSessionReady(const std::string& web_session_id) {
|
| key_added_cb_.Run(web_session_id);
|
| }
|
|
|