Encrypted Media: Destroy CDM in ProxyMediaKeys' dtor.

- Makes sure we destroy the CDM when ProxyMediaKeys is destroyed. - Changes MediaKeysHostMsg_CancelAllPendingSessionCreations message to a more general MediaKeysHostMsg_DestroyCdm message and cancels pending session creations as part of OnDestroyCdm(). BUG=347154,347022 TEST=MediaDrmBridge is properly destroyed with all sessions closed when the MediaPlayer is destroyed. R=dcheng@chromium.org, ddorwin@chromium.org, qinmin@chromium.org Review URL: https://codereview.chromium.org/181593004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253674 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Feb 27, 2014 · d49a486 · d49a486
1 parent 5648dbb
commit d49a486
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
@@ -144,8 +144,7 @@ bool BrowserMediaPlayerManager::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CreateSession, OnCreateSession)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_UpdateSession, OnUpdateSession)
     IPC_MESSAGE_HANDLER(MediaKeysHostMsg_ReleaseSession, OnReleaseSession)
-    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_CancelAllPendingSessionCreations,
-                        OnCancelAllPendingSessionCreations)
+    IPC_MESSAGE_HANDLER(MediaKeysHostMsg_DestroyCdm, OnDestroyCdm)
 #if defined(VIDEO_HOLE)
     IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_NotifyExternalSurface,
                         OnNotifyExternalSurface)
@@ -729,11 +728,16 @@ void BrowserMediaPlayerManager::OnReleaseSession(int media_keys_id,
   drm_bridge->ReleaseSession(session_id);
 }
 
-void BrowserMediaPlayerManager::OnCancelAllPendingSessionCreations(
-    int media_keys_id) {
+void BrowserMediaPlayerManager::OnDestroyCdm(int media_keys_id) {
   MediaDrmBridge* drm_bridge = GetDrmBridge(media_keys_id);
   if (!drm_bridge) return;
 
+  CancelAllPendingSessionCreations(media_keys_id);
+  RemoveDrmBridge(media_keys_id);
+}
+
+void BrowserMediaPlayerManager::CancelAllPendingSessionCreations(
+    int media_keys_id) {
   BrowserContext* context =
       web_contents()->GetRenderProcessHost()->GetBrowserContext();
   context->CancelProtectedMediaIdentifierPermissionRequests(media_keys_id);

diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
@@ -149,8 +149,10 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
                        const std::vector<uint8>& response);
   void OnReleaseSession(int media_keys_id, uint32 session_id);
   void OnSetMediaKeys(int player_id, int media_keys_id);
+  void OnDestroyCdm(int media_keys_id);
 
-  void OnCancelAllPendingSessionCreations(int media_keys_id);
+  // Cancels all pending session creations associated with |media_keys_id|.
+  void CancelAllPendingSessionCreations(int media_keys_id);
 
 #if defined(VIDEO_HOLE)
   virtual void OnNotifyExternalSurface(

diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
@@ -306,7 +306,7 @@ IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,
                     int /* media_keys_id */,
                     uint32_t /* session_id */)
 
-IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_CancelAllPendingSessionCreations,
+IPC_MESSAGE_ROUTED1(MediaKeysHostMsg_DestroyCdm,
                     int /* media_keys_id */)
 
 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,

diff --git a/content/renderer/media/android/proxy_media_keys.cc b/content/renderer/media/android/proxy_media_keys.cc
@@ -32,7 +32,7 @@ ProxyMediaKeys::ProxyMediaKeys(
 }
 
 ProxyMediaKeys::~ProxyMediaKeys() {
-  manager_->CancelAllPendingSessionCreations(media_keys_id_);
+  manager_->DestroyCdm(media_keys_id_);
 }
 
 void ProxyMediaKeys::InitializeCDM(const std::string& key_system,

diff --git a/content/renderer/media/android/renderer_media_player_manager.cc b/content/renderer/media/android/renderer_media_player_manager.cc
@@ -270,10 +270,8 @@ void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
       routing_id(), media_keys_id, session_id));
 }
 
-void RendererMediaPlayerManager::CancelAllPendingSessionCreations(
-    int media_keys_id) {
-  Send(new MediaKeysHostMsg_CancelAllPendingSessionCreations(
-      routing_id(), media_keys_id));
+void RendererMediaPlayerManager::DestroyCdm(int media_keys_id) {
+  Send(new MediaKeysHostMsg_DestroyCdm(routing_id(), media_keys_id));
 }
 
 void RendererMediaPlayerManager::OnSessionCreated(

diff --git a/content/renderer/media/android/renderer_media_player_manager.h b/content/renderer/media/android/renderer_media_player_manager.h
@@ -100,7 +100,7 @@ class RendererMediaPlayerManager : public RenderViewObserver {
                      uint32 session_id,
                      const std::vector<uint8>& response);
   void ReleaseSession(int media_keys_id, uint32 session_id);
-  void CancelAllPendingSessionCreations(int media_keys_id);
+  void DestroyCdm(int media_keys_id);
 
   // Registers and unregisters a WebMediaPlayerAndroid object.
   int RegisterMediaPlayer(WebMediaPlayerAndroid* player);