content/renderer/media/webcontentdecryptionmodule_impl.cc - Issue 380953002: Set callback interface on WebCDMSessionImpl after creation.

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.cc

Issue 380953002: Set callback interface on WebCDMSessionImpl after creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase + change Created 6 years, 5 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

« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.h ('k') | content/renderer/media/webcontentdecryptionmodulesession_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/webcontentdecryptionmodule_impl.cc

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

index c1e455e56fe38e08f82bfa1f37a0b5f571a17610..9dcb39ee9ca98931c5f49c05035f805ed883e846 100644

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

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

@@ -85,9 +85,16 @@ WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() {

// The caller owns the created session.

blink::WebContentDecryptionModuleSession*

+WebContentDecryptionModuleImpl::createSession() {

+ return adapter_->CreateSession();

+blink::WebContentDecryptionModuleSession*

WebContentDecryptionModuleImpl::createSession(

blink::WebContentDecryptionModuleSession::Client* client) {

- return adapter_->CreateSession(client);

+ WebContentDecryptionModuleSessionImpl* session = adapter_->CreateSession();

+ session->setClientInterface(client);

+ return session;

}

media::Decryptor* WebContentDecryptionModuleImpl::GetDecryptor() {