content/renderer/media/webcontentdecryptionmodule_impl.h - Issue 193523002: Encrypted Media: Implement IPC based SetCdm().

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: content/renderer/media/webcontentdecryptionmodule_impl.h

Issue 193523002: Encrypted Media: Implement IPC based SetCdm(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Manage cdm_id_ in CdmSessionAdapter Created 6 years, 9 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: content/renderer/media/webcontentdecryptionmodule_impl.h

diff --git a/content/renderer/media/webcontentdecryptionmodule_impl.h b/content/renderer/media/webcontentdecryptionmodule_impl.h

index d799664bf632065937207e780f4d0dbc55c74182..a8b0fc7edf4597eca11832397e89ba259096ac6d 100644

--- a/content/renderer/media/webcontentdecryptionmodule_impl.h

+++ b/content/renderer/media/webcontentdecryptionmodule_impl.h

@@ -47,6 +47,12 @@ class WebContentDecryptionModuleImpl

// after WebContentDecryptionModule is freed. http://crbug.com/330324

media::Decryptor* GetDecryptor();

+#if defined(OS_ANDROID)

+ // Returns the CDM ID associated with this object. May be kInvalidCdmId if no

+ // CDM ID is associated.

+ int GetCdmId() const;

+#endif // defined(OS_ANDROID)

// blink::WebContentDecryptionModule implementation.

virtual blink::WebContentDecryptionModuleSession* createSession(

blink::WebContentDecryptionModuleSession::Client* client);