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

Side by Side Diff: media/base/cdm_callback_promise.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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/cdm_callback_promise.h" 5 #include "media/base/cdm_callback_promise.h"
6 6
7 #include "base/callback_helpers.h"
7 #include "base/logging.h" 8 #include "base/logging.h"
8 9
9 namespace media { 10 namespace media {
10 11
11 template <typename... T> 12 template <typename... T>
12 CdmCallbackPromise<T...>::CdmCallbackPromise( 13 CdmCallbackPromise<T...>::CdmCallbackPromise(
13 const base::Callback<void(const T&...)>& resolve_cb, 14 const base::Callback<void(const T&...)>& resolve_cb,
14 const PromiseRejectedCB& reject_cb) 15 const PromiseRejectedCB& reject_cb)
15 : resolve_cb_(resolve_cb), reject_cb_(reject_cb) { 16 : resolve_cb_(resolve_cb), reject_cb_(reject_cb) {
16 DCHECK(!resolve_cb_.is_null()); 17 DCHECK(!resolve_cb_.is_null());
17 DCHECK(!reject_cb_.is_null()); 18 DCHECK(!reject_cb_.is_null());
18 } 19 }
19 20
20 template <typename... T> 21 template <typename... T>
21 CdmCallbackPromise<T...>::~CdmCallbackPromise() { 22 CdmCallbackPromise<T...>::~CdmCallbackPromise() {
23 if (IsPromiseSettled())
24 return;
25
26 DCHECK(!resolve_cb_.is_null() && !reject_cb_.is_null());
27 RejectPromiseOnDestruction();
22 } 28 }
23 29
24 template <typename... T> 30 template <typename... T>
25 void CdmCallbackPromise<T...>::resolve(const T&... result) { 31 void CdmCallbackPromise<T...>::resolve(const T&... result) {
26 MarkPromiseSettled(); 32 MarkPromiseSettled();
27 resolve_cb_.Run(result...); 33 base::ResetAndReturn(&resolve_cb_).Run(result...);
28 } 34 }
29 35
30 template <typename... T> 36 template <typename... T>
31 void CdmCallbackPromise<T...>::reject(MediaKeys::Exception exception_code, 37 void CdmCallbackPromise<T...>::reject(MediaKeys::Exception exception_code,
32 uint32_t system_code, 38 uint32_t system_code,
33 const std::string& error_message) { 39 const std::string& error_message) {
34 MarkPromiseSettled(); 40 MarkPromiseSettled();
35 reject_cb_.Run(exception_code, system_code, error_message); 41 base::ResetAndReturn(&reject_cb_)
42 .Run(exception_code, system_code, error_message);
36 } 43 }
37 44
38 // Explicit template instantiation for the Promises needed. 45 // Explicit template instantiation for the Promises needed.
39 template class MEDIA_EXPORT CdmCallbackPromise<>; 46 template class MEDIA_EXPORT CdmCallbackPromise<>;
40 template class MEDIA_EXPORT CdmCallbackPromise<std::string>; 47 template class MEDIA_EXPORT CdmCallbackPromise<std::string>;
41 48
42 } // namespace media 49 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698