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

Side by Side Diff: media/base/cdm_callback_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, 9 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 #ifndef MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ 5 #ifndef MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ 6 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 18 matching lines...) Expand all
29 const PromiseRejectedCB& reject_cb); 29 const PromiseRejectedCB& reject_cb);
30 virtual ~CdmCallbackPromise(); 30 virtual ~CdmCallbackPromise();
31 31
32 // CdmPromiseTemplate<T> implementation. 32 // CdmPromiseTemplate<T> implementation.
33 virtual void resolve(const T&... result) override; 33 virtual void resolve(const T&... result) override;
34 virtual void reject(MediaKeys::Exception exception_code, 34 virtual void reject(MediaKeys::Exception exception_code,
35 uint32_t system_code, 35 uint32_t system_code,
36 const std::string& error_message) override; 36 const std::string& error_message) override;
37 37
38 private: 38 private:
39 using CdmPromiseTemplate<T...>::IsPromiseSettled;
39 using CdmPromiseTemplate<T...>::MarkPromiseSettled; 40 using CdmPromiseTemplate<T...>::MarkPromiseSettled;
41 using CdmPromiseTemplate<T...>::RejectPromiseOnDestruction;
40 42
41 base::Callback<void(const T&...)> resolve_cb_; 43 base::Callback<void(const T&...)> resolve_cb_;
42 PromiseRejectedCB reject_cb_; 44 PromiseRejectedCB reject_cb_;
43 45
44 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise); 46 DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise);
45 }; 47 };
46 48
47 } // namespace media 49 } // namespace media
48 50
49 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_ 51 #endif // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698