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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/cdm_promise.cc

Issue 567123002: Cleanup template in CdmPromise (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: back to promise Created 6 years, 3 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
« media/base/cdm_promise.h ('K') | « media/base/cdm_promise.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/cdm_promise.cc
diff --git a/media/base/cdm_promise.cc b/media/base/cdm_promise.cc
index 74ff8bca68b1e93fc063e9b4fe1c63c45095f703..3a7fc4e5b4e02f59e63f281564169a249cc70a3f 100644
--- a/media/base/cdm_promise.cc
+++ b/media/base/cdm_promise.cc
@@ -10,6 +10,30 @@
namespace media {
+template <typename T>
+struct CdmPromiseTraits {};
+
+template <>
+struct CdmPromiseTraits<void> {
+ static CdmPromise::ResolveParameterType ParameterType() {
+ return CdmPromise::VOID_TYPE;
xhwang 2014/09/20 00:34:50 You can simply do: static const CdmPromise::Resol
jrummell 2014/09/22 19:21:10 Done.
+ }
+};
+
+template <>
+struct CdmPromiseTraits<std::string> {
+ static CdmPromise::ResolveParameterType ParameterType() {
+ return CdmPromise::STRING_TYPE;
+ }
+};
+
+template <>
+struct CdmPromiseTraits<KeyIdsVector> {
+ static CdmPromise::ResolveParameterType ParameterType() {
+ return CdmPromise::KEY_IDS_VECTOR_TYPE;
+ }
+};
+
CdmPromise::CdmPromise() : is_pending_(true) {
}
@@ -21,6 +45,7 @@ CdmPromise::CdmPromise(PromiseRejectedCB reject_cb)
CdmPromise::CdmPromise(PromiseRejectedCB reject_cb, const std::string& uma_name)
: reject_cb_(reject_cb), is_pending_(true), uma_name_(uma_name) {
DCHECK(!reject_cb_.is_null());
+ DCHECK(!uma_name_.empty());
}
CdmPromise::~CdmPromise() {
@@ -57,120 +82,99 @@ void CdmPromise::reject(MediaKeys::Exception exception_code,
if (!uma_name_.empty()) {
ResultCodeForUMA result_code = ConvertExceptionToUMAResult(exception_code);
base::LinearHistogram::FactoryGet(
- uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
+ uma_name_,
+ 1,
+ NUM_RESULT_CODES,
+ NUM_RESULT_CODES + 1,
base::HistogramBase::kUmaTargetedHistogramFlag)->Add(result_code);
}
reject_cb_.Run(exception_code, system_code, error_message);
}
-CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
- PromiseRejectedCB reject_cb)
- : CdmPromise(reject_cb), resolve_cb_(resolve_cb) {
- DCHECK(!resolve_cb_.is_null());
-}
-
-CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
- PromiseRejectedCB reject_cb,
- const std::string& uma_name)
- : CdmPromise(reject_cb, uma_name), resolve_cb_(resolve_cb) {
- DCHECK(!resolve_cb_.is_null());
- DCHECK(!uma_name_.empty());
-}
-
-CdmPromiseTemplate<void>::CdmPromiseTemplate() {
-}
-
-CdmPromiseTemplate<void>::~CdmPromiseTemplate() {
- DCHECK(!is_pending_);
-}
-
-void CdmPromiseTemplate<void>::resolve() {
+void CdmPromise::ReportResolution() {
DCHECK(is_pending_);
is_pending_ = false;
if (!uma_name_.empty()) {
base::LinearHistogram::FactoryGet(
ddorwin 2014/09/19 20:56:46 As discussed offline, it might make sense to extra
jrummell 2014/09/22 19:21:10 Done.
- uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
+ uma_name_,
+ 1,
+ NUM_RESULT_CODES,
+ NUM_RESULT_CODES + 1,
base::HistogramBase::kUmaTargetedHistogramFlag)->Add(SUCCESS);
}
- resolve_cb_.Run();
}
-CdmPromise::ResolveParameterType
-CdmPromiseTemplate<void>::GetResolveParameterType() const {
- return VOID_TYPE;
-}
-
-CdmPromiseTemplate<std::string>::CdmPromiseTemplate(
- base::Callback<void(const std::string&)> resolve_cb,
+template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate(
+ base::Callback<void(const T&)> resolve_cb,
PromiseRejectedCB reject_cb)
: CdmPromise(reject_cb), resolve_cb_(resolve_cb) {
DCHECK(!resolve_cb_.is_null());
}
-CdmPromiseTemplate<std::string>::CdmPromiseTemplate(
- base::Callback<void(const std::string&)> resolve_cb,
+template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate(
+ base::Callback<void(const T&)> resolve_cb,
PromiseRejectedCB reject_cb,
const std::string& uma_name)
: CdmPromise(reject_cb, uma_name), resolve_cb_(resolve_cb) {
DCHECK(!resolve_cb_.is_null());
}
-CdmPromiseTemplate<std::string>::CdmPromiseTemplate() {
+template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate() {
ddorwin 2014/09/19 20:56:46 hopefully remove
jrummell 2014/09/22 19:21:10 See comment in .h file.
}
-CdmPromiseTemplate<std::string>::~CdmPromiseTemplate() {
+template <typename T>
+CdmPromiseTemplate<T>::~CdmPromiseTemplate() {
DCHECK(!is_pending_);
ddorwin 2014/09/19 20:56:46 The parent's destructor is already doing this. We
jrummell 2014/09/22 19:21:10 Done.
}
-void CdmPromiseTemplate<std::string>::resolve(const std::string& result) {
- DCHECK(is_pending_);
- is_pending_ = false;
- if (!uma_name_.empty()) {
- base::LinearHistogram::FactoryGet(
- uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
- base::HistogramBase::kUmaTargetedHistogramFlag)->Add(SUCCESS);
- }
+template <typename T>
+void CdmPromiseTemplate<T>::resolve(const T& result) {
+ ReportResolution();
resolve_cb_.Run(result);
}
+template <typename T>
CdmPromise::ResolveParameterType
-CdmPromiseTemplate<std::string>::GetResolveParameterType() const {
- return STRING_TYPE;
+CdmPromiseTemplate<T>::GetResolveParameterType() const {
+ return CdmPromiseTraits<T>::ParameterType();
}
-CdmPromiseTemplate<KeyIdsVector>::CdmPromiseTemplate(
- base::Callback<void(const KeyIdsVector&)> resolve_cb,
- PromiseRejectedCB reject_cb)
+CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
+ PromiseRejectedCB reject_cb)
: CdmPromise(reject_cb), resolve_cb_(resolve_cb) {
DCHECK(!resolve_cb_.is_null());
}
-CdmPromiseTemplate<KeyIdsVector>::CdmPromiseTemplate(
- base::Callback<void(const KeyIdsVector&)> resolve_cb,
- PromiseRejectedCB reject_cb,
- const std::string& uma_name)
+CdmPromiseTemplate<void>::CdmPromiseTemplate(base::Callback<void()> resolve_cb,
+ PromiseRejectedCB reject_cb,
+ const std::string& uma_name)
: CdmPromise(reject_cb, uma_name), resolve_cb_(resolve_cb) {
DCHECK(!resolve_cb_.is_null());
+ DCHECK(!uma_name_.empty());
+}
+
+CdmPromiseTemplate<void>::CdmPromiseTemplate() {
}
-CdmPromiseTemplate<KeyIdsVector>::~CdmPromiseTemplate() {
+CdmPromiseTemplate<void>::~CdmPromiseTemplate() {
DCHECK(!is_pending_);
}
-void CdmPromiseTemplate<KeyIdsVector>::resolve(const KeyIdsVector& result) {
- DCHECK(is_pending_);
- is_pending_ = false;
- if (!uma_name_.empty()) {
- base::LinearHistogram::FactoryGet(
- uma_name_, 1, NUM_RESULT_CODES, NUM_RESULT_CODES + 1,
- base::HistogramBase::kUmaTargetedHistogramFlag)->Add(SUCCESS);
- }
- resolve_cb_.Run(result);
+void CdmPromiseTemplate<void>::resolve() {
+ ReportResolution();
+ resolve_cb_.Run();
}
CdmPromise::ResolveParameterType
-CdmPromiseTemplate<KeyIdsVector>::GetResolveParameterType() const {
- return KEY_IDS_VECTOR_TYPE;
+CdmPromiseTemplate<void>::GetResolveParameterType() const {
+ return CdmPromiseTraits<void>::ParameterType();
}
+// Explicit template instantiation for the Promises needed.
+template class MEDIA_EXPORT CdmPromiseTemplate<std::string>;
+template class MEDIA_EXPORT CdmPromiseTemplate<KeyIdsVector>;
+
} // namespace media
« media/base/cdm_promise.h ('K') | « media/base/cdm_promise.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698