ppapi/proxy/ppapi_messages.h - Issue 10854209: Modify the PPAPI CDM interface to pass more info.

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: ppapi/proxy/ppapi_messages.h

Issue 10854209: Modify the PPAPI CDM interface to pass more info. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updates that resolve xhwang's comments. Created 8 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

« ppapi/proxy/content_decryptor_private_serializer-inl.h ('K') | « ppapi/proxy/content_decryptor_private_serializer-inl.h ('k') | ppapi/proxy/ppb_instance_proxy.h » ('j') | ppapi/proxy/ppb_instance_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/proxy/ppapi_messages.h

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h

index ded1fa1825779e52402a6b72743fc57d47239a54..3d4a6ede00de08b0576bafde1d893b5c0eb7e3f7 100644

--- a/ppapi/proxy/ppapi_messages.h

+++ b/ppapi/proxy/ppapi_messages.h

@@ -589,21 +589,22 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,

PP_Instance /* instance */,

ppapi::proxy::SerializedVar /* key_system, String */,

ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)

-IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_AddKey,

+IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey,

PP_Instance /* instance */,

ppapi::proxy::SerializedVar /* session_id, String */,

- ppapi::proxy::SerializedVar /* key, ArrayBuffer */)

+ ppapi::proxy::SerializedVar /* key, ArrayBuffer */,

+ ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)

IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,

PP_Instance /* instance */,

ppapi::proxy::SerializedVar /* session_id, String */)

IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,

PP_Instance /* instance */,

ppapi::proxy::PPPDecryptor_Buffer /* buffer */,

- int32_t /* request_id */)

+ std::string /* serialized_block_info */)

IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecode,

PP_Instance /* instance */,

- ppapi::HostResource /* encrypted_block, PPB_Buffer_Dev */,

- int32_t /* request_id */)

+ ppapi::proxy::PPPDecryptor_Buffer /* buffer */,

+ std::string /* serialized_block_info */)

// PPB_NetworkMonitor_Private.

IPC_MESSAGE_ROUTED2(PpapiMsg_PPBNetworkMonitor_NetworkList,

@@ -1191,15 +1192,15 @@ IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError,

IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,

PP_Instance /* instance */,

PP_Resource /* decrypted_block, PPB_Buffer_Dev */,

- int32_t /* request_id */)

+ std::string /* serialized_block_info */)

IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,

PP_Instance /* instance */,

PP_Resource /* decrypted_frame, PPB_Buffer_Dev */,

- int32_t /* request_id */)

+ std::string /* serialized_block_info */)

IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples,

PP_Instance /* instance */,

PP_Resource /* decrypted_samples, PPB_Buffer_Dev */,

- int32_t /* request_id */)

+ std::string /* serialized_block_info */)

// PPB_NetworkMonitor_Private.

IPC_MESSAGE_CONTROL1(PpapiHostMsg_PPBNetworkMonitor_Start,