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

Unified Diff: media/base/cdm_promise_adapter.cc

Issue 1375663003: Verify EME calls made on same thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/cdm_promise_adapter.h ('k') | media/blink/webcontentdecryptionmodulesession_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/cdm_promise_adapter.cc
diff --git a/media/base/cdm_promise_adapter.cc b/media/base/cdm_promise_adapter.cc
index 70993b580eca49910c7bee394c496f8ec65fa679..aed28307157693f4c90ac367480cef973eaef60a 100644
--- a/media/base/cdm_promise_adapter.cc
+++ b/media/base/cdm_promise_adapter.cc
@@ -13,10 +13,12 @@ CdmPromiseAdapter::CdmPromiseAdapter() : next_promise_id_(1) {
CdmPromiseAdapter::~CdmPromiseAdapter() {
DCHECK(promises_.empty());
+ DCHECK(thread_checker_.CalledOnValidThread());
Clear();
}
uint32_t CdmPromiseAdapter::SavePromise(scoped_ptr<CdmPromise> promise) {
+ DCHECK(thread_checker_.CalledOnValidThread());
uint32_t promise_id = next_promise_id_++;
promises_.add(promise_id, promise.Pass());
return promise_id;
@@ -57,12 +59,14 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id,
void CdmPromiseAdapter::Clear() {
// Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
for (auto& promise : promises_)
promise.second->reject(MediaKeys::UNKNOWN_ERROR, 0, "Operation aborted.");
promises_.clear();
}
scoped_ptr<CdmPromise> CdmPromiseAdapter::TakePromise(uint32_t promise_id) {
+ DCHECK(thread_checker_.CalledOnValidThread());
PromiseMap::iterator it = promises_.find(promise_id);
if (it == promises_.end())
return nullptr;
« no previous file with comments | « media/base/cdm_promise_adapter.h ('k') | media/blink/webcontentdecryptionmodulesession_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698