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

Unified Diff: media/blink/new_session_cdm_result_promise.cc

Issue 1729063003: media: Reject pending CDM promise during destruction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/blink/new_session_cdm_result_promise.cc
diff --git a/media/blink/new_session_cdm_result_promise.cc b/media/blink/new_session_cdm_result_promise.cc
index 4a97c34720894641b932b94b35bff19ace670e2d..57de08c9d0a963a67fb2e409a5bfae54c7e3fe6e 100644
--- a/media/blink/new_session_cdm_result_promise.cc
+++ b/media/blink/new_session_cdm_result_promise.cc
@@ -36,6 +36,13 @@ NewSessionCdmResultPromise::NewSessionCdmResultPromise(
}
NewSessionCdmResultPromise::~NewSessionCdmResultPromise() {
+ if (web_cdm_result_.isCompleted())
+ return;
+
+ std::string message =
+ "Unfulfilled promise rejected automatically during destruction.";
+ DVLOG(1) << message;
+ reject(MediaKeys::INVALID_STATE_ERROR, 0, message);
}
void NewSessionCdmResultPromise::resolve(const std::string& session_id) {

Powered by Google App Engine
This is Rietveld 408576698