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..ae31df34bc47fda5d149acf2bfeff3930ab1631a 100644 |
--- a/media/base/cdm_promise_adapter.cc |
+++ b/media/base/cdm_promise_adapter.cc |
@@ -17,6 +17,8 @@ CdmPromiseAdapter::~CdmPromiseAdapter() { |
} |
uint32_t CdmPromiseAdapter::SavePromise(scoped_ptr<CdmPromise> promise) { |
+ DVLOG(1) << "CdmPromiseAdapter::" << __FUNCTION__; |
+ base::AutoLock lock(lock_); |
uint32_t promise_id = next_promise_id_++; |
promises_.add(promise_id, promise.Pass()); |
return promise_id; |
@@ -25,6 +27,8 @@ uint32_t CdmPromiseAdapter::SavePromise(scoped_ptr<CdmPromise> promise) { |
template <typename... T> |
void CdmPromiseAdapter::ResolvePromise(uint32_t promise_id, |
const T&... result) { |
+ DVLOG(1) << "CdmPromiseAdapter::" << __FUNCTION__; |
+ base::AutoLock lock(lock_); |
scoped_ptr<CdmPromise> promise = TakePromise(promise_id); |
if (!promise) { |
NOTREACHED() << "Promise not found for " << promise_id; |
@@ -46,6 +50,8 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id, |
MediaKeys::Exception exception_code, |
uint32 system_code, |
const std::string& error_message) { |
+ DVLOG(1) << "CdmPromiseAdapter::" << __FUNCTION__; |
+ base::AutoLock lock(lock_); |
scoped_ptr<CdmPromise> promise = TakePromise(promise_id); |
if (!promise) { |
NOTREACHED() << "No promise found for promise_id " << promise_id; |
@@ -56,6 +62,8 @@ void CdmPromiseAdapter::RejectPromise(uint32_t promise_id, |
} |
void CdmPromiseAdapter::Clear() { |
+ DVLOG(1) << "CdmPromiseAdapter::" << __FUNCTION__; |
+ base::AutoLock lock(lock_); |
// Reject all outstanding promises. |
for (auto& promise : promises_) |
promise.second->reject(MediaKeys::UNKNOWN_ERROR, 0, "Operation aborted."); |