media/blink/webcontentdecryptionmodule_impl.h - Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously.

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/blink/webcontentdecryptionmodule_impl.h

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 years, 8 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

« media/blink/encrypted_media_player_support.cc ('K') | « media/blink/encrypted_media_player_support.cc ('k') | media/blink/webcontentdecryptionmodule_impl.cc » ('j') | media/cdm/default_cdm_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/webcontentdecryptionmodule_impl.h

diff --git a/media/blink/webcontentdecryptionmodule_impl.h b/media/blink/webcontentdecryptionmodule_impl.h

index 8b38cc6bc7cf9cc4b7eb7e4f0879849ab133e43e..aa7fa16d8ba9a5fff4b9eb7f882b44358da64c65 100644

--- a/media/blink/webcontentdecryptionmodule_impl.h

+++ b/media/blink/webcontentdecryptionmodule_impl.h

@@ -52,6 +52,8 @@ class MEDIA_EXPORT WebContentDecryptionModuleImpl

CdmContext* GetCdmContext();

private:

+ friend CdmSessionAdapter;

// Takes reference to |adapter|.

WebContentDecryptionModuleImpl(scoped_refptr<CdmSessionAdapter> adapter);