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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/cdm_promise.cc

Issue 448893002: Update ClearKey to support CDM_6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cdm6
Patch Set: Changes Created 6 years, 4 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') | media/base/media_keys.h » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')
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 ec5e913dbb8aae93c90aa30a24835aaa1a3cc3e8..fd7bd3bda4b83fb68dca77336645796bffba9f14 100644
--- a/media/base/cdm_promise.cc
+++ b/media/base/cdm_promise.cc
@@ -38,6 +38,10 @@ CdmPromiseTemplate<T>::CdmPromiseTemplate(
}
template <typename T>
+CdmPromiseTemplate<T>::CdmPromiseTemplate() {
+}
+
+template <typename T>
CdmPromiseTemplate<T>::~CdmPromiseTemplate() {
DCHECK(!is_pending_);
}
@@ -70,5 +74,6 @@ void CdmPromiseTemplate<void>::resolve() {
// 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') | media/base/media_keys.h » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698