media/mojo/services/mojo_cdm_service.h - Issue 1407933010: media: Make MediaKeys ref-counted.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/mojo/services/mojo_cdm_service.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:

Index: media/mojo/services/mojo_cdm_service.h

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

index a2424c8a1a8d9ba9ed3c461e31ad910f5dd86a9b..d2330465043fd119debf2a48fba64125cb574092 100644

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

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

@@ -78,7 +78,7 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {

// Callback for CdmFactory::Create().

void OnCdmCreated(int cdm_id,

scoped_ptr<MojoCdmPromise<>> promise,

- scoped_ptr<MediaKeys> cdm,

+ const scoped_refptr<MediaKeys>& cdm,

const std::string& error_message);

// Callbacks for firing session events.

@@ -102,7 +102,7 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {

mojo::ServiceProvider* service_provider_;

CdmFactory* cdm_factory_;

- scoped_ptr<MediaKeys> cdm_;

+ scoped_refptr<MediaKeys> cdm_;

// Set to a valid CDM ID if the |cdm_| is successfully created.

int cdm_id_;