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

Unified Diff: content/renderer/media/crypto/proxy_media_keys.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 1 month 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
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | content/renderer/media/crypto/proxy_media_keys.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/crypto/proxy_media_keys.h
diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h
index b256dfa5e29390936a6013b491e6cf95b3610acb..66291cd06cce859eb7ee9281b6ca8990959794d7 100644
--- a/content/renderer/media/crypto/proxy_media_keys.h
+++ b/content/renderer/media/crypto/proxy_media_keys.h
@@ -39,8 +39,6 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
const media::SessionExpirationUpdateCB& session_expiration_update_cb,
const media::CdmCreatedCB& cdm_created_cb);
- ~ProxyMediaKeys() override;
-
// MediaKeys implementation.
void SetServerCertificate(
const std::vector<uint8_t>& certificate,
@@ -99,6 +97,8 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {
const media::SessionKeysChangeCB& session_keys_change_cb,
const media::SessionExpirationUpdateCB& session_expiration_update_cb);
+ ~ProxyMediaKeys() override;
+
void InitializeCdm(const std::string& key_system,
const GURL& security_origin,
bool use_hw_secure_codecs,
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | content/renderer/media/crypto/proxy_media_keys.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698