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

Unified Diff: media/mojo/services/mojo_cdm.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address timav@'s comments. 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/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 4c60030000f587ac06d02d111af7aad253bb106c..d73577e63922efe03669ce0aa2f38ffc934e7e16 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -37,18 +37,17 @@ void MojoCdm::Create(
const media::SessionKeysChangeCB& session_keys_change_cb,
const media::SessionExpirationUpdateCB& session_expiration_update_cb,
const media::CdmCreatedCB& cdm_created_cb) {
- scoped_ptr<MojoCdm> mojo_cdm(
+ scoped_refptr<MojoCdm> mojo_cdm(
new MojoCdm(remote_cdm.Pass(), session_message_cb, session_closed_cb,
legacy_session_error_cb, session_keys_change_cb,
session_expiration_update_cb));
- // |mojo_cdm|'s ownership will be passed to the promise. Get a raw pointer
- // here in order to call Initialize().
- MojoCdm* mojo_cdm_ptr = mojo_cdm.get();
+ // |mojo_cdm| ownership is passed to the promise.
scoped_ptr<CdmInitializedPromise> promise(
- new CdmInitializedPromise(cdm_created_cb, mojo_cdm.Pass()));
- mojo_cdm_ptr->InitializeCdm(key_system, security_origin, cdm_config,
- promise.Pass());
+ new CdmInitializedPromise(cdm_created_cb, mojo_cdm));
+
+ mojo_cdm->InitializeCdm(key_system, security_origin, cdm_config,
+ promise.Pass());
}
MojoCdm::MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,

Powered by Google App Engine
This is Rietveld 408576698