media/mojo/services/mojo_cdm.h - Issue 1407933010: media: Make MediaKeys ref-counted. - Code Review

Chromium Code Reviews

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

(653)

My Issues | Starred Open | Closed | All

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

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

« media/cdm/proxy_decryptor.h ('K') | « media/media.gyp ('k') | media/mojo/services/mojo_cdm.cc » ('j') | media/mojo/services/mojo_cdm_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/mojo/services/mojo_cdm.h

diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h

index 96b4532ba1e0955990bd787e655634979d21d84f..a02083d32f5c3bdd9598000f6f18924a8139fd24 100644

--- a/media/mojo/services/mojo_cdm.h

+++ b/media/mojo/services/mojo_cdm.h

@@ -41,8 +41,6 @@ class MojoCdm : public MediaKeys,

const media::SessionExpirationUpdateCB& session_expiration_update_cb,

const media::CdmCreatedCB& cdm_created_cb);

- ~MojoCdm() final;

-

// MediaKeys implementation.

void SetServerCertificate(const std::vector<uint8_t>& certificate,

scoped_ptr<SimpleCdmPromise> promise) final;

@@ -75,6 +73,8 @@ class MojoCdm : public MediaKeys,

const SessionKeysChangeCB& session_keys_change_cb,

const SessionExpirationUpdateCB& session_expiration_update_cb);

+ ~MojoCdm() final;

+

void InitializeCdm(const std::string& key_system,

const GURL& security_origin,

const media::CdmConfig& cdm_config,

« media/cdm/proxy_decryptor.h ('K') | « media/media.gyp ('k') | media/mojo/services/mojo_cdm.cc » ('j') | media/mojo/services/mojo_cdm_service.h » ('J')

Powered by Google App Engine

This is Rietveld 408576698