content/renderer/media/cdm/render_cdm_factory.cc - Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME

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/cdm/render_cdm_factory.cc

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 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/cdm/render_cdm_factory.h ('k') | content/renderer/media/cdm/renderer_cdm_manager.h » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/cdm/render_cdm_factory.cc

diff --git a/content/renderer/media/cdm/render_cdm_factory.cc b/content/renderer/media/cdm/render_cdm_factory.cc

index cb74450e501db31562a7b0faf226b6ed48a22479..e461d0a4ee941b3726d24e84dd971d75ac6a84d6 100644

--- a/content/renderer/media/cdm/render_cdm_factory.cc

+++ b/content/renderer/media/cdm/render_cdm_factory.cc

@@ -46,7 +46,6 @@ void RenderCdmFactory::Create(

const media::CdmConfig& cdm_config,

const media::SessionMessageCB& session_message_cb,

const media::SessionClosedCB& session_closed_cb,

- const media::LegacySessionErrorCB& legacy_session_error_cb,

const media::SessionKeysChangeCB& session_keys_change_cb,

const media::SessionExpirationUpdateCB& session_expiration_update_cb,

const media::CdmCreatedCB& cdm_created_cb) {

@@ -74,15 +73,15 @@ void RenderCdmFactory::Create(

PpapiDecryptor::Create(

key_system, security_origin, cdm_config.allow_distinctive_identifier,

cdm_config.allow_persistent_state, create_pepper_cdm_cb_,

- session_message_cb, session_closed_cb, legacy_session_error_cb,

- session_keys_change_cb, session_expiration_update_cb, cdm_created_cb);

+ session_message_cb, session_closed_cb, session_keys_change_cb,

+ session_expiration_update_cb, cdm_created_cb);

#elif defined(ENABLE_BROWSER_CDMS)

DCHECK(cdm_config.allow_distinctive_identifier);

DCHECK(cdm_config.allow_persistent_state);

ProxyMediaKeys::Create(

key_system, security_origin, cdm_config.use_hw_secure_codecs, manager_,

- session_message_cb, session_closed_cb, legacy_session_error_cb,

- session_keys_change_cb, session_expiration_update_cb, cdm_created_cb);

+ session_message_cb, session_closed_cb, session_keys_change_cb,

+ session_expiration_update_cb, cdm_created_cb);

#else

// No possible CDM to create, so fail the request.

base::ThreadTaskRunnerHandle::Get()->PostTask(