content/common/media/cdm_messages.h - Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid.

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/common/media/cdm_messages.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update unittest. Created 5 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/browser/media/cdm/browser_cdm_manager.h ('K') | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/media/cdm_messages.h

diff --git a/content/common/media/cdm_messages.h b/content/common/media/cdm_messages.h

index e9d1958edc65524b33868e284f40b194b9f12def..1efe0aec040a34f0ca05ff8b44d0aac56ca91d99 100644

--- a/content/common/media/cdm_messages.h

+++ b/content/common/media/cdm_messages.h

@@ -29,6 +29,12 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,

IPC_ENUM_TRAITS_MAX_VALUE(CdmHostMsg_CreateSession_InitDataType,

INIT_DATA_TYPE_MAX)

+IPC_STRUCT_BEGIN(CdmHostMsg_InitializeCdm_Params)

+ IPC_STRUCT_MEMBER(std::string, key_system)

+ IPC_STRUCT_MEMBER(GURL, security_origin)

+ IPC_STRUCT_MEMBER(bool, use_hw_secure_codecs)

+IPC_STRUCT_END()

IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)

IPC_STRUCT_TRAITS_MEMBER(key_id)

IPC_STRUCT_TRAITS_MEMBER(status)

@@ -37,12 +43,11 @@ IPC_STRUCT_TRAITS_END()

// Messages from render to browser.

-IPC_MESSAGE_CONTROL5(CdmHostMsg_InitializeCdm,

+IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm,

int /* render_frame_id */,

int /* cdm_id */,

uint32_t /* promise_id */,

- std::string /* key_system */,

- GURL /* security_origin */)

+ CdmHostMsg_InitializeCdm_Params /* params */)

IPC_MESSAGE_CONTROL4(CdmHostMsg_SetServerCertificate,

int /* render_frame_id */,