| Index: content/renderer/media/android/renderer_media_player_manager.cc
|
| diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
|
| index a37a4e1f885f53908dd85a055c365281f2b4bfaa..a27c80bdb84b1a60a3c1770475422da9277bf1c4 100644
|
| --- a/content/renderer/media/android/renderer_media_player_manager.cc
|
| +++ b/content/renderer/media/android/renderer_media_player_manager.cc
|
| @@ -239,10 +239,17 @@ void RendererMediaPlayerManager::ExitFullscreen(int player_id) {
|
| Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id));
|
| }
|
|
|
| +void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) {
|
| + if (cdm_id == kInvalidCdmId)
|
| + return;
|
| + Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id));
|
| +}
|
| +
|
| void RendererMediaPlayerManager::InitializeCdm(int cdm_id,
|
| ProxyMediaKeys* media_keys,
|
| const std::string& key_system,
|
| const GURL& frame_url) {
|
| + DCHECK_NE(cdm_id, kInvalidCdmId);
|
| RegisterMediaKeys(cdm_id, media_keys);
|
| Send(new CdmHostMsg_InitializeCdm(
|
| routing_id(), cdm_id, key_system, frame_url));
|
| @@ -253,6 +260,7 @@ void RendererMediaPlayerManager::CreateSession(
|
| uint32 session_id,
|
| CdmHostMsg_CreateSession_ContentType content_type,
|
| const std::vector<uint8>& init_data) {
|
| + DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
|
| Send(new CdmHostMsg_CreateSession(
|
| routing_id(), cdm_id, session_id, content_type, init_data));
|
| }
|
| @@ -261,15 +269,18 @@ void RendererMediaPlayerManager::UpdateSession(
|
| int cdm_id,
|
| uint32 session_id,
|
| const std::vector<uint8>& response) {
|
| + DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
|
| Send(
|
| new CdmHostMsg_UpdateSession(routing_id(), cdm_id, session_id, response));
|
| }
|
|
|
| void RendererMediaPlayerManager::ReleaseSession(int cdm_id, uint32 session_id) {
|
| + DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
|
| Send(new CdmHostMsg_ReleaseSession(routing_id(), cdm_id, session_id));
|
| }
|
|
|
| void RendererMediaPlayerManager::DestroyCdm(int cdm_id) {
|
| + DCHECK(GetMediaKeys(cdm_id)) << "|cdm_id| not registered.";
|
| Send(new CdmHostMsg_DestroyCdm(routing_id(), cdm_id));
|
| }
|
|
|
|
|