Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Side by Side Diff: media/base/cdm_session_tracker.cc

Issue 2551333002: media: Avoid access violation in MojoCdm after connection error (Closed)
Patch Set: comments addressed Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/cdm_session_tracker.h ('k') | media/mojo/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/cdm_session_tracker.h" 5 #include "media/base/cdm_session_tracker.h"
6 6
7 namespace media { 7 namespace media {
8 8
9 CdmSessionTracker::CdmSessionTracker() {} 9 CdmSessionTracker::CdmSessionTracker() {}
10 10
11 CdmSessionTracker::~CdmSessionTracker() { 11 CdmSessionTracker::~CdmSessionTracker() {
12 DCHECK(session_ids_.empty()); 12 DCHECK(!HasRemainingSessions());
13 } 13 }
14 14
15 void CdmSessionTracker::AddSession(const std::string& session_id) { 15 void CdmSessionTracker::AddSession(const std::string& session_id) {
16 DCHECK(session_ids_.find(session_id) == session_ids_.end()); 16 DCHECK(session_ids_.find(session_id) == session_ids_.end());
17 session_ids_.insert(session_id); 17 session_ids_.insert(session_id);
18 } 18 }
19 19
20 void CdmSessionTracker::RemoveSession(const std::string& session_id) { 20 void CdmSessionTracker::RemoveSession(const std::string& session_id) {
21 auto it = session_ids_.find(session_id); 21 auto it = session_ids_.find(session_id);
22 DCHECK(it != session_ids_.end()); 22 DCHECK(it != session_ids_.end());
23 session_ids_.erase(it); 23 session_ids_.erase(it);
24 } 24 }
25 25
26 void CdmSessionTracker::CloseRemainingSessions( 26 void CdmSessionTracker::CloseRemainingSessions(
27 const SessionClosedCB& session_closed_cb) { 27 const SessionClosedCB& session_closed_cb) {
28 std::unordered_set<std::string> session_ids; 28 std::unordered_set<std::string> session_ids;
29 session_ids.swap(session_ids_); 29 session_ids.swap(session_ids_);
30 30
31 for (const auto& session_id : session_ids) 31 for (const auto& session_id : session_ids)
32 session_closed_cb.Run(session_id); 32 session_closed_cb.Run(session_id);
33 } 33 }
34 34
35 bool CdmSessionTracker::HasRemainingSessions() const {
36 return !session_ids_.empty();
37 }
38
35 } // namespace media 39 } // namespace media
OLDNEW
« no previous file with comments | « media/base/cdm_session_tracker.h ('k') | media/mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698