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

Unified Diff: media/cdm/proxy_decryptor.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 | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/proxy_decryptor.h
diff --git a/media/cdm/proxy_decryptor.h b/media/cdm/proxy_decryptor.h
index c7f60b94d3692196ab0d2ab0ef6a57196d61d170..bcf34c218cca2827c9642ae8a0d78d9f8f059f9c 100644
--- a/media/cdm/proxy_decryptor.h
+++ b/media/cdm/proxy_decryptor.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "base/containers/hash_tables.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
@@ -77,7 +78,7 @@ class MEDIA_EXPORT ProxyDecryptor {
void OnCdmCreated(const std::string& key_system,
const GURL& security_origin,
const CdmContextReadyCB& cdm_context_ready_cb,
- scoped_ptr<MediaKeys> cdm,
+ const scoped_refptr<MediaKeys>& cdm,
const std::string& error_message);
void GenerateKeyRequestInternal(EmeInitDataType init_data_type,
@@ -129,7 +130,7 @@ class MEDIA_EXPORT ProxyDecryptor {
bool is_creating_cdm_;
// The real MediaKeys that manages key operations for the ProxyDecryptor.
- scoped_ptr<MediaKeys> media_keys_;
+ scoped_refptr<MediaKeys> media_keys_;
#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
MediaPermission* media_permission_;
« no previous file with comments | « media/cdm/ppapi/external_clear_key/clear_key_cdm.cc ('k') | media/cdm/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698