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

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

Issue 1729063003: media: Reject pending CDM promise during destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 years, 10 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
Index: media/mojo/services/mojo_cdm_promise.h
diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h
index f56a589a90d076c9a354afd5506c68de040c42a6..e2797c220444616e7d4bb2d4744be674cb5be5ed 100644
--- a/media/mojo/services/mojo_cdm_promise.h
+++ b/media/mojo/services/mojo_cdm_promise.h
@@ -33,7 +33,9 @@ class MojoCdmPromise : public CdmPromiseTemplate<T...> {
const std::string& error_message) final;
private:
- using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
+ using CdmPromiseTemplate<T...>::IsPromiseSettled;
+ using CdmPromiseTemplate<T...>::MarkPromiseSettled;
+ using CdmPromiseTemplate<T...>::RejectPromiseOnDestruction;
CallbackType callback_;
};

Powered by Google App Engine
This is Rietveld 408576698