ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c - Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest().

Unified Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 2 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/cpp/private/content_decryptor_private.cc ('k') | ppapi/proxy/ppapi_messages.h » ('j') | webkit/media/crypto/ppapi/cdm_wrapper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

index 6b7f4eca8427cb1f2e8cab8b4807b53282a9213c..007b522cf0ea5a75410b003c5babcc92ea2e66c2 100644

--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

@@ -3,7 +3,7 @@

* found in the LICENSE file.

-/* Last generated from IDL: Mon Oct 22 19:49:47 2012. */

+/* Last generated from IDL: Thu Oct 25 21:09:58 2012. */

#include "ppapi/generators/pnacl_shim.h"

#include "ppapi/c/ppb.h"

@@ -3439,10 +3439,10 @@ struct PP_Var Pnacl_M19_PPB_X509Certificate_Private_GetField(PP_Resource resourc

/* Begin wrapper methods for PPP_ContentDecryptor_Private_0_5 */

-static void Pnacl_M24_PPP_ContentDecryptor_Private_GenerateKeyRequest(PP_Instance instance, struct PP_Var key_system, struct PP_Var init_data) {

+static void Pnacl_M24_PPP_ContentDecryptor_Private_GenerateKeyRequest(PP_Instance instance, struct PP_Var key_system, struct PP_Var mime_type, struct PP_Var init_data) {

const struct PPP_ContentDecryptor_Private_0_5 *iface = Pnacl_WrapperInfo_PPP_ContentDecryptor_Private_0_5.real_iface;

- void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, struct PP_Var key_system, struct PP_Var init_data) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, struct PP_Var key_system, struct PP_Var init_data))iface->GenerateKeyRequest);

- temp_fp(instance, key_system, init_data);

+ void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, struct PP_Var key_system, struct PP_Var mime_type, struct PP_Var init_data) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, struct PP_Var key_system, struct PP_Var mime_type, struct PP_Var init_data))iface->GenerateKeyRequest);

+ temp_fp(instance, key_system, mime_type, init_data);

}

static void Pnacl_M24_PPP_ContentDecryptor_Private_AddKey(PP_Instance instance, struct PP_Var session_id, struct PP_Var key, struct PP_Var init_data) {

@@ -4301,7 +4301,7 @@ struct PPB_X509Certificate_Private_0_1 Pnacl_Wrappers_PPB_X509Certificate_Privat

};

struct PPP_ContentDecryptor_Private_0_5 Pnacl_Wrappers_PPP_ContentDecryptor_Private_0_5 = {

- .GenerateKeyRequest = (void (*)(PP_Instance instance, struct PP_Var key_system, struct PP_Var init_data))&Pnacl_M24_PPP_ContentDecryptor_Private_GenerateKeyRequest,

+ .GenerateKeyRequest = (void (*)(PP_Instance instance, struct PP_Var key_system, struct PP_Var mime_type, struct PP_Var init_data))&Pnacl_M24_PPP_ContentDecryptor_Private_GenerateKeyRequest,

.AddKey = (void (*)(PP_Instance instance, struct PP_Var session_id, struct PP_Var key, struct PP_Var init_data))&Pnacl_M24_PPP_ContentDecryptor_Private_AddKey,

.CancelKeyRequest = (void (*)(PP_Instance instance, struct PP_Var session_id))&Pnacl_M24_PPP_ContentDecryptor_Private_CancelKeyRequest,

.Decrypt = (void (*)(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M24_PPP_ContentDecryptor_Private_Decrypt,