Add PPAPI decryptor interfaces.

ppapi/proxy/ppapi_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message header, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 464 matching lines @@
 IPC_SYNC_MESSAGE_ROUTED3_2(PpapiMsg_PPPClass_Construct,
                            int64 /* ppp_class */,
                            int64 /* object */,
                            std::vector<ppapi::proxy::SerializedVar> /* args */,
                            ppapi::proxy::SerializedVar /* out_exception */,
                            ppapi::proxy::SerializedVar /* result */)
 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 */,
                     PP_Resource /* resource */,
                     int32 /* result */,
                     std::string /* value */)
 
 // PPP_Graphics3D_Dev.
 IPC_MESSAGE_ROUTED1(PpapiMsg_PPPGraphics3D_ContextLost,
                     PP_Instance /* instance */)
@@ skipping 526 matching lines @@
                     PP_Rect /* caret */,
                     PP_Rect /* bounding_box */)
 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBInstance_CancelCompositionText,
                     PP_Instance /* instance */)
 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_UpdateSurroundingText,
                     PP_Instance /* instance */,
                     std::string /* text */,
                     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 */,
                            ppapi::HostResource /* result */)
 IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBURLLoader_Open,
                     ppapi::HostResource /* loader */,
                     ppapi::PPB_URLRequestInfo_Data /* request_data */)
 IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBURLLoader_FollowRedirect,
                     ppapi::HostResource /* loader */)
 IPC_SYNC_MESSAGE_ROUTED1_1(
@@ skipping 414 matching lines @@
 
 // File chooser.
 IPC_MESSAGE_CONTROL0(PpapiHostMsg_FileChooser_Create)
 IPC_MESSAGE_CONTROL4(PpapiHostMsg_FileChooser_Show,
                      bool /* save_as */,
                      bool /* open_multiple */,
                      std::string /* suggested_file_name */,
                      std::vector<std::string> /* accept_mime_types */)
 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FileChooser_ShowReply,
                      std::vector<ppapi::PPB_FileRef_CreateInfo> /* files */)