content/renderer/media/crypto/content_decryption_module_factory.cc - Issue 265993002: Add Promises for EME (Chromium side)

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/crypto/content_decryption_module_factory.cc

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: latest CDM_5 Created 6 years, 7 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

« content/renderer/media/cdm_session_adapter.cc ('K') | « content/renderer/media/crypto/content_decryption_module_factory.h ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | content/renderer/media/crypto/proxy_decryptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/crypto/content_decryption_module_factory.cc

diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc

index 82d6b0f6d85540a816a4186d3c041c07e0f3fb36..ed969f328b5499c1d93ecd4bfd01d10473c0b315 100644

--- a/content/renderer/media/crypto/content_decryption_module_factory.cc

+++ b/content/renderer/media/crypto/content_decryption_module_factory.cc

@@ -27,7 +27,6 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(

RendererMediaPlayerManager* manager,

int* cdm_id,

#endif // defined(ENABLE_PEPPER_CDMS)

- const media::SessionCreatedCB& session_created_cb,

const media::SessionMessageCB& session_message_cb,

const media::SessionReadyCB& session_ready_cb,

const media::SessionClosedCB& session_closed_cb,

@@ -43,18 +42,13 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(

if (CanUseAesDecryptor(key_system)) {

return scoped_ptr<media::MediaKeys>(

- new media::AesDecryptor(session_created_cb,

- session_message_cb,

- session_ready_cb,

- session_closed_cb,

- session_error_cb));

+ new media::AesDecryptor(session_message_cb));

}

#if defined(ENABLE_PEPPER_CDMS)

return scoped_ptr<media::MediaKeys>(

PpapiDecryptor::Create(key_system,

security_origin,

create_pepper_cdm_cb,

- session_created_cb,

session_message_cb,

session_ready_cb,

session_closed_cb,

@@ -64,7 +58,6 @@ scoped_ptr<media::MediaKeys> ContentDecryptionModuleFactory::Create(

ProxyMediaKeys::Create(key_system,

security_origin,

manager,

- session_created_cb,

session_message_cb,

session_ready_cb,

session_closed_cb,