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

Unified Diff: media/base/cdm_initialized_promise.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 2 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
Index: media/base/cdm_initialized_promise.h
diff --git a/media/base/cdm_initialized_promise.h b/media/base/cdm_initialized_promise.h
index bc4a56970ce0db4917c6d8abec770e55f836719d..f0ca0121021560089383c723d2299db445f26d9d 100644
--- a/media/base/cdm_initialized_promise.h
+++ b/media/base/cdm_initialized_promise.h
@@ -5,7 +5,7 @@
#ifndef MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
#define MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ref_counted.h"
#include "media/base/cdm_factory.h"
#include "media/base/cdm_promise.h"
#include "media/base/media_export.h"
@@ -19,7 +19,7 @@ namespace media {
class MEDIA_EXPORT CdmInitializedPromise : public SimpleCdmPromise {
public:
CdmInitializedPromise(const CdmCreatedCB& cdm_created_cb,
- scoped_ptr<MediaKeys> cdm);
+ const scoped_refptr<MediaKeys>& cdm);
~CdmInitializedPromise() override;
// SimpleCdmPromise implementation.
@@ -30,7 +30,9 @@ class MEDIA_EXPORT CdmInitializedPromise : public SimpleCdmPromise {
private:
CdmCreatedCB cdm_created_cb_;
- scoped_ptr<MediaKeys> cdm_;
+
+ // Holds a ref-count of the CDM.
+ scoped_refptr<MediaKeys> cdm_;
};
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698