content/renderer/media/cdm/proxy_media_keys.h - 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/proxy_media_keys.h

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/ppapi_decryptor.cc ('k') | content/renderer/media/cdm/proxy_media_keys.cc » ('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/proxy_media_keys.h

diff --git a/content/renderer/media/cdm/proxy_media_keys.h b/content/renderer/media/cdm/proxy_media_keys.h

index e78ea365bef3f9d60b4d3627a8273cfcea34698f..c50aa7ac43d26b61516b4d4662120febf3bbfa38 100644

--- a/content/renderer/media/cdm/proxy_media_keys.h

+++ b/content/renderer/media/cdm/proxy_media_keys.h

@@ -36,7 +36,6 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {

RendererCdmManager* manager,

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);

@@ -70,13 +69,8 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {

// Callbacks.

void OnSessionMessage(const std::string& session_id,

media::MediaKeys::MessageType message_type,

- const std::vector<uint8_t>& message,

- const GURL& legacy_destination_url);

+ const std::vector<uint8_t>& message);

void OnSessionClosed(const std::string& session_id);

- void OnLegacySessionError(const std::string& session_id,

- media::MediaKeys::Exception exception,

- uint32_t system_code,

- const std::string& error_message);

void OnSessionKeysChange(const std::string& session_id,

bool has_additional_usable_key,

media::CdmKeysInfo keys_info);

@@ -96,7 +90,6 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {

RendererCdmManager* manager,

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);

@@ -112,7 +105,6 @@ class ProxyMediaKeys : public media::MediaKeys, public media::CdmContext {

media::SessionMessageCB session_message_cb_;

media::SessionClosedCB session_closed_cb_;

- media::LegacySessionErrorCB legacy_session_error_cb_;

media::SessionKeysChangeCB session_keys_change_cb_;

media::SessionExpirationUpdateCB session_expiration_update_cb_;