| Index: content/renderer/media/android/webmediaplayer_android.cc
|
| diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
|
| index fe32f058372a53d9820cdbf8a5f61fd53bb90e88..d3b0dcbf0ebd69ab335dd6b38c96900459bea07d 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.cc
|
| +++ b/content/renderer/media/android/webmediaplayer_android.cc
|
| @@ -313,6 +313,8 @@ void WebMediaPlayerAndroid::load(LoadType load_type,
|
| base::Bind(&WebMediaPlayerAndroid::UpdateNetworkState,
|
| weak_factory_.GetWeakPtr()),
|
| base::Bind(&WebMediaPlayerAndroid::OnDurationChanged,
|
| + weak_factory_.GetWeakPtr()),
|
| + base::Bind(&WebMediaPlayerAndroid::OnWaitingForDecryptionKey,
|
| weak_factory_.GetWeakPtr()));
|
| InitializePlayer(url_, frame_->document().firstPartyForCookies(),
|
| true, demuxer_client_id);
|
| @@ -1759,6 +1761,15 @@ void WebMediaPlayerAndroid::OnEncryptedMediaInitData(
|
| vector_as_array(&init_data), init_data.size());
|
| }
|
|
|
| +void WebMediaPlayerAndroid::OnWaitingForDecryptionKey() {
|
| + client_->didBlockPlaybackWaitingForKey();
|
| +
|
| + // TODO(jrummell): didResumePlaybackBlockedForKey() should only be called
|
| + // when a key has been successfully added (e.g. OnSessionKeysChange() with
|
| + // |has_additional_usable_key| = true). http://crbug.com/461903
|
| + client_->didResumePlaybackBlockedForKey();
|
| +}
|
| +
|
| void WebMediaPlayerAndroid::SetCdmInternal(
|
| const media::CdmAttachedCB& cdm_attached_cb) {
|
| DCHECK(cdm_context_ && is_player_initialized_);
|
|
|