Add PPAPI decryptor interfaces.

ppapi/proxy/ppapi_messages.h

Index: ppapi/proxy/ppapi_messages.h
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index 20a33f32585ff5f70e04c2ac1f53c3ec33f67d1b..b338e35f540caf809fa3a75758cb0198cd6dd91e 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -482,6 +482,30 @@ IPC_MESSAGE_ROUTED2(PpapiMsg_PPPClass_Deallocate,
                     int64 /* ppp_class */,
                     int64 /* object */)
 
+
+// PPP_ContentDecryptor_Dev
+// TODO(tomfinegan): There's a decent chance that I have the usage of
+// ppapi::HostResource and PP_Resource reversed. Confirm/fix if necessary.

[dmichael (off chromium), 2012/08/08 03:38:10]

Yes, these being Host->Plugin messages, you should use HostResource here.

[Tom Finegan, 2012/08/08 19:02:15]

Done.

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* key_system */,
+                    ppapi::proxy::SerializedVar /* init_data */)
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_AddKey,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* session_id */,
+                    ppapi::proxy::SerializedVar /* key */)
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* session_id */)
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,
+                    PP_Instance /* instance */,
+                    PP_Resource /* encrypted_block */,
+                    uint64_t /* request_id */)
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecode,
+                    PP_Instance /* instance */,
+                    PP_Resource /* encrypted_block */,
+                    uint64_t /* request_id */)
+
 // PPB_Flash_DeviceID.
 IPC_MESSAGE_ROUTED4(PpapiMsg_PPBFlashDeviceID_GetReply,
                     int32 /* routing_id */,
@@ -1028,6 +1052,42 @@ IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_UpdateSurroundingText,
                     uint32_t /* caret */,
                     uint32_t /* anchor */)
 
+// PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy.
+IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_NeedKey,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* key_system */,
+                    ppapi::proxy::SerializedVar /* session_id */,
+                    ppapi::proxy::SerializedVar /* init_data */)
+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* key_system */,
+                    ppapi::proxy::SerializedVar /* session_id */)
+IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* key_system */,
+                    ppapi::proxy::SerializedVar /* session_id */,
+                    ppapi::HostResource /* message */,

[dmichael (off chromium), 2012/08/08 03:38:10]

And these PPB messages should use PP_Resource. It's probably worth mentioning
that this is a PPB_Buffer resource
/* message, PPB_Buffer */

[Tom Finegan, 2012/08/08 19:02:15]

Done, also added type comments to the vars.

+                    ppapi::proxy::SerializedVar /* default_url */)
+IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyError,
+                    PP_Instance /* instance */,
+                    ppapi::proxy::SerializedVar /* key_system */,
+                    ppapi::proxy::SerializedVar /* session_id */,
+                    int32_t /* media_error */,
+                    int32_t /* system_error */)
+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,
+                    PP_Instance /* instance */,
+                    ppapi::HostResource /* decrypted_block */,
+                    uint64_t /* request_id */)
+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,
+                    PP_Instance /* instance */,
+                    ppapi::HostResource /* decrypted_frame */,
+                    uint64_t /* request_id */)
+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples,
+                    PP_Instance /* instance */,
+                    ppapi::HostResource /* decrypted_samples */,
+                    uint64_t /* request_id */)
+
+
 // PPB_URLLoader.
 IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBURLLoader_Create,
                            PP_Instance /* instance */,