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

Unified Diff: media/mojo/services/mojo_cdm_promise.cc

Issue 817143003: Fix MojoCdmPromise resolving. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm_promise.cc
diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc
index 3257bd8877f0f77d83837f60d0feb710ea2aa348..4f17f117ead6a1de2f7dd510d5f334972ee8d0f5 100644
--- a/media/mojo/services/mojo_cdm_promise.cc
+++ b/media/mojo/services/mojo_cdm_promise.cc
@@ -40,6 +40,7 @@ MojoCdmPromise<T...>::~MojoCdmPromise() {
template <typename... T>
void MojoCdmPromise<T...>::resolve(const T&... result) {
+ MarkPromiseSettled();
mojo::CdmPromiseResultPtr cdm_promise_result(mojo::CdmPromiseResult::New());
cdm_promise_result->success = true;
callback_.Run(cdm_promise_result.Pass(),
@@ -51,6 +52,7 @@ template <typename... T>
void MojoCdmPromise<T...>::reject(MediaKeys::Exception exception,
uint32_t system_code,
const std::string& error_message) {
+ MarkPromiseSettled();
callback_.Run(GetRejectResult(exception, system_code, error_message),
MojoTypeTrait<T>::DefaultValue()...);
callback_.reset();
« no previous file with comments | « media/mojo/services/mojo_cdm_promise.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698