diff options
| author | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 03:05:54 +0000 |
|---|---|---|
| committer | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 03:08:33 +0000 |
| commit | 1e52c2922ac0b9b3483cc6c5cb2c51c472773b57 (patch) | |
| tree | 832c05ceebb1bac77477a0c661bd0b3278a113e6 /media/base/cdm_promise.cc | |
| parent | 0fd76c553e9b03357d11e158866cbdf3f0617514 (diff) | |
| download | chromium_src-1e52c2922ac0b9b3483cc6c5cb2c51c472773b57.zip chromium_src-1e52c2922ac0b9b3483cc6c5cb2c51c472773b57.tar.gz chromium_src-1e52c2922ac0b9b3483cc6c5cb2c51c472773b57.tar.bz2 | |
Update ClearKey to support CDM_6
This change adds support for GetUsableKeyIds() and RemoveSession(),
and renames ReleaseSession() to CloseSession(). There are also
changes due to the Ready event no longer being generated by the CDM
interface.
BUG=358271,351139
TEST=encrypted-media layout tests and browser_tests for encrypted media pass
Review URL: https://codereview.chromium.org/448893002
Cr-Commit-Position: refs/heads/master@{#289755}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/cdm_promise.cc')
| -rw-r--r-- | media/base/cdm_promise.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/base/cdm_promise.cc b/media/base/cdm_promise.cc index e57d4f4..13ee760 100644 --- a/media/base/cdm_promise.cc +++ b/media/base/cdm_promise.cc @@ -81,6 +81,10 @@ CdmPromiseTemplate<T>::CdmPromiseTemplate( } template <typename T> +CdmPromiseTemplate<T>::CdmPromiseTemplate() { +} + +template <typename T> CdmPromiseTemplate<T>::~CdmPromiseTemplate() { DCHECK(!is_pending_); } @@ -131,5 +135,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 |