BrowserCdmManager: remove CDMs on correct thread on RenderFrameDeleted.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/task_runner.h"
@@ skipping 103 matching lines @@
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 media::BrowserCdm* BrowserCdmManager::GetCdm(int render_frame_id, int cdm_id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   return cdm_map_.get(GetId(render_frame_id, cdm_id));
 }
 
 void BrowserCdmManager::RenderFrameDeleted(int render_frame_id) {

[damienv1, 2014/11/16 00:00:46]

nit: early return feels more natural here.

if (!task_runner_->RunsTaskOnCurrentTHread()) {
  PostTask(...);
  return;
}
RemoveAllCdmForFrame(...);

[gunsch, 2014/11/17 16:17:37]

Done.

-  DCHECK(task_runner_->RunsTasksOnCurrentThread());
-
-  std::vector<uint64> ids_to_remove;
-  for (CdmMap::iterator it = cdm_map_.begin(); it != cdm_map_.end(); ++it) {
-    if (IdBelongsToFrame(it->first, render_frame_id))
-      ids_to_remove.push_back(it->first);
+  if (task_runner_->RunsTasksOnCurrentThread()) {
+    RemoveCdmsForFrame(render_frame_id);
+  } else {
+    task_runner_->PostTask(
+        FROM_HERE,
+        base::Bind(&BrowserCdmManager::RemoveCdmsForFrame,
+                   this, render_frame_id));
   }
-
-  for (size_t i = 0; i < ids_to_remove.size(); ++i)
-    RemoveCdm(ids_to_remove[i]);
 }
 
 void BrowserCdmManager::OnSessionCreated(int render_frame_id,
                                          int cdm_id,
                                          uint32 session_id,
                                          const std::string& web_session_id) {
   Send(new CdmMsg_SessionCreated(
       render_frame_id, cdm_id, session_id, web_session_id));
 }
 
@@ skipping 193 matching lines @@
     // as GetCdm() will return null.
     DVLOG(1) << "failed to create CDM.";
     return;
   }
 
   uint64 id = GetId(render_frame_id, cdm_id);
   cdm_map_.add(id, cdm.Pass());
   cdm_security_origin_map_[id] = security_origin;
 }
 
+void BrowserCdmManager::RemoveCdmsForFrame(int render_frame_id) {
+  DCHECK(task_runner_->RunsTasksOnCurrentThread());
+
+  std::vector<uint64> ids_to_remove;
+  for (CdmMap::iterator it = cdm_map_.begin(); it != cdm_map_.end(); ++it) {
+    if (IdBelongsToFrame(it->first, render_frame_id))
+      ids_to_remove.push_back(it->first);
+  }
+
+  for (size_t i = 0; i < ids_to_remove.size(); ++i)
+    RemoveCdm(ids_to_remove[i]);
+}
+
 void BrowserCdmManager::RemoveCdm(uint64 id) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
 
   cdm_map_.erase(id);
   cdm_security_origin_map_.erase(id);
   if (cdm_cancel_permission_map_.count(id)) {
     cdm_cancel_permission_map_[id].Run();
     cdm_cancel_permission_map_.erase(id);
   }
 }
@@ skipping 16 matching lines @@
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
     SendSessionError(render_frame_id, cdm_id, session_id);
     return;
   }
 
   // This could fail, in which case a SessionError will be fired.
   cdm->CreateSession(session_id, content_type, &init_data[0], init_data.size());
 }
 
 }  // namespace content