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

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

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
« no previous file with comments | « chromecast/media/cdm/browser_cdm_cast.cc ('k') | media/base/cdm_callback_promise.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index c83bdd213149ab4b97240dc79543f21629afbd28..db94775d626ff91874e1646bd675b03c546d4766 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -72,7 +72,10 @@ class CdmPromiseInternal : public media::CdmPromiseTemplate<T...> {
DCHECK(manager_);
}
- ~CdmPromiseInternal() final {}
+ ~CdmPromiseInternal() final {
+ if (!IsPromiseSettled())
+ RejectPromiseOnDestruction();
+ }
// CdmPromiseTemplate<> implementation.
void resolve(const T&... result) final;
@@ -88,7 +91,9 @@ class CdmPromiseInternal : public media::CdmPromiseTemplate<T...> {
}
private:
+ using media::CdmPromiseTemplate<T...>::IsPromiseSettled;
using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
+ using media::CdmPromiseTemplate<T...>::RejectPromiseOnDestruction;
base::WeakPtr<BrowserCdmManager> const manager_;
const int render_frame_id_;
« no previous file with comments | « chromecast/media/cdm/browser_cdm_cast.cc ('k') | media/base/cdm_callback_promise.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698