ppapi/proxy/ppapi_messages.h - Issue 496143002: Update Pepper interface for EME

Unified Diff: ppapi/proxy/ppapi_messages.h

Issue 496143002: Update Pepper interface for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: GetResolveParameterType Created 6 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/cpp/private/content_decryptor_private.cc ('K') | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c ('k') | ppapi/proxy/ppb_instance_proxy.h » ('j') | no next file with comments »
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 9afdcbc10e3ee7420eb35aad78ef56cc0b5b4461..4b13afbbff6d964aab51c54445f041febafe41cb 100644

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

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

@@ -757,6 +757,10 @@ IPC_MESSAGE_ROUTED3(

IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_Initialize,

PP_Instance /* instance */,

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

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_SetServerCertificate,

+ PP_Instance /* instance */,

+ uint32_t /* promise_id */,

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

palmer 2014/08/26 19:09:21 http://www.chromium.org/Home/chromium-security/edu

jrummell 2014/08/29 22:35:35 I just copied what is used for the other EME metho

IPC_MESSAGE_ROUTED5(PpapiMsg_PPPContentDecryptor_CreateSession,

PP_Instance /* instance */,

uint32_t /* promise_id */,

@@ -772,7 +776,15 @@ IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_UpdateSession,

uint32_t /* promise_id */,

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

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

-IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_ReleaseSession,

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_CloseSession,

+ PP_Instance /* instance */,

+ uint32_t /* promise_id */,

+ ppapi::proxy::SerializedVar /* web_session_id, String */)

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_RemoveSession,

+ PP_Instance /* instance */,

+ uint32_t /* promise_id */,

+ ppapi::proxy::SerializedVar /* web_session_id, String */)

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GetUsableKeyIds,

PP_Instance /* instance */,

uint32_t /* promise_id */,

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

@@ -1092,6 +1104,10 @@ IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_PromiseResolvedWithSession,

PP_Instance /* instance */,

uint32_t /* promise_id */,

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

+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_PromiseResolvedWithKeyIds,

+ PP_Instance /* instance */,

+ uint32_t /* promise_id */,

+ ppapi::proxy::SerializedVar /* key_ids, Array */)

IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_PromiseRejected,

PP_Instance /* instance */,

uint32_t /* promise_id */,

@@ -1103,6 +1119,14 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_SessionMessage,

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

ppapi::proxy::SerializedVar /* message, ArrayBuffer */,

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

+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_SessionKeysChange,

+ PP_Instance /* instance */,

+ ppapi::proxy::SerializedVar /* web_session_id, String */,

+ PP_Bool /* has_additional_usable_key */)

+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_SessionExpirationChange,

+ PP_Instance /* instance */,

+ ppapi::proxy::SerializedVar /* web_session_id, String */,

+ PP_Time /* new_expiry_time */)

IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBInstance_SessionReady,

PP_Instance /* instance */,

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