Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Side by Side Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

Issue 813683005: Add |legacy_destination_url| back to SessionMessage for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes Created 5 years, 11 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 unified diff | Download patch
« no previous file with comments | « ppapi/cpp/private/content_decryptor_private.cc ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2015 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2015 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 */ 4 */
5 5
6 /* NOTE: this is auto-generated from IDL */ 6 /* NOTE: this is auto-generated from IDL */
7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h" 7 #include "ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.h"
8 8
9 #include "ppapi/c/ppb.h" 9 #include "ppapi/c/ppb.h"
10 #include "ppapi/c/dev/ppb_audio_input_dev.h" 10 #include "ppapi/c/dev/ppb_audio_input_dev.h"
(...skipping 2881 matching lines...) Expand 10 before | Expand all | Expand 10 after
2892 static void Pnacl_M41_PPB_ContentDecryptor_Private_PromiseResolvedWithSession(PP _Instance instance, uint32_t promise_id, struct PP_Var* web_session_id) { 2892 static void Pnacl_M41_PPB_ContentDecryptor_Private_PromiseResolvedWithSession(PP _Instance instance, uint32_t promise_id, struct PP_Var* web_session_id) {
2893 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface; 2893 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface;
2894 iface->PromiseResolvedWithSession(instance, promise_id, *web_session_id); 2894 iface->PromiseResolvedWithSession(instance, promise_id, *web_session_id);
2895 } 2895 }
2896 2896
2897 static void Pnacl_M41_PPB_ContentDecryptor_Private_PromiseRejected(PP_Instance i nstance, uint32_t promise_id, PP_CdmExceptionCode exception_code, uint32_t syste m_code, struct PP_Var* error_description) { 2897 static void Pnacl_M41_PPB_ContentDecryptor_Private_PromiseRejected(PP_Instance i nstance, uint32_t promise_id, PP_CdmExceptionCode exception_code, uint32_t syste m_code, struct PP_Var* error_description) {
2898 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface; 2898 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface;
2899 iface->PromiseRejected(instance, promise_id, exception_code, system_code, *err or_description); 2899 iface->PromiseRejected(instance, promise_id, exception_code, system_code, *err or_description);
2900 } 2900 }
2901 2901
2902 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionMessage(PP_Instance in stance, struct PP_Var* web_session_id, PP_CdmMessageType message_type, struct PP _Var* message) { 2902 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionMessage(PP_Instance in stance, struct PP_Var* web_session_id, PP_CdmMessageType message_type, struct PP _Var* message, struct PP_Var* legacy_destination_url) {
2903 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface; 2903 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface;
2904 iface->SessionMessage(instance, *web_session_id, message_type, *message); 2904 iface->SessionMessage(instance, *web_session_id, message_type, *message, *lega cy_destination_url);
2905 } 2905 }
2906 2906
2907 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionKeysChange(PP_Instance instance, struct PP_Var* web_session_id, PP_Bool has_additional_usable_key, uin t32_t key_count, const struct PP_KeyInformation key_information[]) { 2907 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionKeysChange(PP_Instance instance, struct PP_Var* web_session_id, PP_Bool has_additional_usable_key, uin t32_t key_count, const struct PP_KeyInformation key_information[]) {
2908 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface; 2908 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface;
2909 iface->SessionKeysChange(instance, *web_session_id, has_additional_usable_key, key_count, key_information); 2909 iface->SessionKeysChange(instance, *web_session_id, has_additional_usable_key, key_count, key_information);
2910 } 2910 }
2911 2911
2912 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionExpirationChange(PP_In stance instance, struct PP_Var* web_session_id, PP_Time new_expiry_time) { 2912 static void Pnacl_M41_PPB_ContentDecryptor_Private_SessionExpirationChange(PP_In stance instance, struct PP_Var* web_session_id, PP_Time new_expiry_time) {
2913 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface; 2913 const struct PPB_ContentDecryptor_Private_0_13 *iface = Pnacl_WrapperInfo_PPB_ ContentDecryptor_Private_0_13.real_iface;
2914 iface->SessionExpirationChange(instance, *web_session_id, new_expiry_time); 2914 iface->SessionExpirationChange(instance, *web_session_id, new_expiry_time);
(...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after
5433 /* Not generating wrapper interface for PPP_Widget_Dev_0_2 */ 5433 /* Not generating wrapper interface for PPP_Widget_Dev_0_2 */
5434 5434
5435 /* Not generating wrapper interface for PPP_Zoom_Dev_0_3 */ 5435 /* Not generating wrapper interface for PPP_Zoom_Dev_0_3 */
5436 5436
5437 /* Not generating wrapper interface for PPB_CameraCapabilities_Private_0_1 */ 5437 /* Not generating wrapper interface for PPB_CameraCapabilities_Private_0_1 */
5438 5438
5439 static const struct PPB_ContentDecryptor_Private_0_13 Pnacl_Wrappers_PPB_Content Decryptor_Private_0_13 = { 5439 static const struct PPB_ContentDecryptor_Private_0_13 Pnacl_Wrappers_PPB_Content Decryptor_Private_0_13 = {
5440 .PromiseResolved = (void (*)(PP_Instance instance, uint32_t promise_id))&Pna cl_M41_PPB_ContentDecryptor_Private_PromiseResolved, 5440 .PromiseResolved = (void (*)(PP_Instance instance, uint32_t promise_id))&Pna cl_M41_PPB_ContentDecryptor_Private_PromiseResolved,
5441 .PromiseResolvedWithSession = (void (*)(PP_Instance instance, uint32_t promi se_id, struct PP_Var web_session_id))&Pnacl_M41_PPB_ContentDecryptor_Private_Pro miseResolvedWithSession, 5441 .PromiseResolvedWithSession = (void (*)(PP_Instance instance, uint32_t promi se_id, struct PP_Var web_session_id))&Pnacl_M41_PPB_ContentDecryptor_Private_Pro miseResolvedWithSession,
5442 .PromiseRejected = (void (*)(PP_Instance instance, uint32_t promise_id, PP_C dmExceptionCode exception_code, uint32_t system_code, struct PP_Var error_descri ption))&Pnacl_M41_PPB_ContentDecryptor_Private_PromiseRejected, 5442 .PromiseRejected = (void (*)(PP_Instance instance, uint32_t promise_id, PP_C dmExceptionCode exception_code, uint32_t system_code, struct PP_Var error_descri ption))&Pnacl_M41_PPB_ContentDecryptor_Private_PromiseRejected,
5443 .SessionMessage = (void (*)(PP_Instance instance, struct PP_Var web_session_ id, PP_CdmMessageType message_type, struct PP_Var message))&Pnacl_M41_PPB_Conten tDecryptor_Private_SessionMessage, 5443 .SessionMessage = (void (*)(PP_Instance instance, struct PP_Var web_session_ id, PP_CdmMessageType message_type, struct PP_Var message, struct PP_Var legacy_ destination_url))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionMessage,
5444 .SessionKeysChange = (void (*)(PP_Instance instance, struct PP_Var web_sessi on_id, PP_Bool has_additional_usable_key, uint32_t key_count, const struct PP_Ke yInformation key_information[]))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionK eysChange, 5444 .SessionKeysChange = (void (*)(PP_Instance instance, struct PP_Var web_sessi on_id, PP_Bool has_additional_usable_key, uint32_t key_count, const struct PP_Ke yInformation key_information[]))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionK eysChange,
5445 .SessionExpirationChange = (void (*)(PP_Instance instance, struct PP_Var web _session_id, PP_Time new_expiry_time))&Pnacl_M41_PPB_ContentDecryptor_Private_Se ssionExpirationChange, 5445 .SessionExpirationChange = (void (*)(PP_Instance instance, struct PP_Var web _session_id, PP_Time new_expiry_time))&Pnacl_M41_PPB_ContentDecryptor_Private_Se ssionExpirationChange,
5446 .SessionClosed = (void (*)(PP_Instance instance, struct PP_Var web_session_i d))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionClosed, 5446 .SessionClosed = (void (*)(PP_Instance instance, struct PP_Var web_session_i d))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionClosed,
5447 .SessionError = (void (*)(PP_Instance instance, struct PP_Var web_session_id , PP_CdmExceptionCode exception_code, uint32_t system_code, struct PP_Var error_ description))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionError, 5447 .SessionError = (void (*)(PP_Instance instance, struct PP_Var web_session_id , PP_CdmExceptionCode exception_code, uint32_t system_code, struct PP_Var error_ description))&Pnacl_M41_PPB_ContentDecryptor_Private_SessionError,
5448 .DeliverBlock = (void (*)(PP_Instance instance, PP_Resource decrypted_block, const struct PP_DecryptedBlockInfo* decrypted_block_info))&Pnacl_M41_PPB_Conten tDecryptor_Private_DeliverBlock, 5448 .DeliverBlock = (void (*)(PP_Instance instance, PP_Resource decrypted_block, const struct PP_DecryptedBlockInfo* decrypted_block_info))&Pnacl_M41_PPB_Conten tDecryptor_Private_DeliverBlock,
5449 .DecoderInitializeDone = (void (*)(PP_Instance instance, PP_DecryptorStreamT ype decoder_type, uint32_t request_id, PP_Bool success))&Pnacl_M41_PPB_ContentDe cryptor_Private_DecoderInitializeDone, 5449 .DecoderInitializeDone = (void (*)(PP_Instance instance, PP_DecryptorStreamT ype decoder_type, uint32_t request_id, PP_Bool success))&Pnacl_M41_PPB_ContentDe cryptor_Private_DecoderInitializeDone,
5450 .DecoderDeinitializeDone = (void (*)(PP_Instance instance, PP_DecryptorStrea mType decoder_type, uint32_t request_id))&Pnacl_M41_PPB_ContentDecryptor_Private _DecoderDeinitializeDone, 5450 .DecoderDeinitializeDone = (void (*)(PP_Instance instance, PP_DecryptorStrea mType decoder_type, uint32_t request_id))&Pnacl_M41_PPB_ContentDecryptor_Private _DecoderDeinitializeDone,
5451 .DecoderResetDone = (void (*)(PP_Instance instance, PP_DecryptorStreamType d ecoder_type, uint32_t request_id))&Pnacl_M41_PPB_ContentDecryptor_Private_Decode rResetDone, 5451 .DecoderResetDone = (void (*)(PP_Instance instance, PP_DecryptorStreamType d ecoder_type, uint32_t request_id))&Pnacl_M41_PPB_ContentDecryptor_Private_Decode rResetDone,
5452 .DeliverFrame = (void (*)(PP_Instance instance, PP_Resource decrypted_frame, const struct PP_DecryptedFrameInfo* decrypted_frame_info))&Pnacl_M41_PPB_Conten tDecryptor_Private_DeliverFrame, 5452 .DeliverFrame = (void (*)(PP_Instance instance, PP_Resource decrypted_frame, const struct PP_DecryptedFrameInfo* decrypted_frame_info))&Pnacl_M41_PPB_Conten tDecryptor_Private_DeliverFrame,
5453 .DeliverSamples = (void (*)(PP_Instance instance, PP_Resource audio_frames, const struct PP_DecryptedSampleInfo* decrypted_sample_info))&Pnacl_M41_PPB_Conte ntDecryptor_Private_DeliverSamples 5453 .DeliverSamples = (void (*)(PP_Instance instance, PP_Resource audio_frames, const struct PP_DecryptedSampleInfo* decrypted_sample_info))&Pnacl_M41_PPB_Conte ntDecryptor_Private_DeliverSamples
(...skipping 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after
6753 6753
6754 /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */ 6754 /* Initialize the real_iface if it hasn't been. The wrapper depends on it. */
6755 if (wrapper->real_iface == NULL) { 6755 if (wrapper->real_iface == NULL) {
6756 const void *iface = (*__real_PPPGetInterface)(name); 6756 const void *iface = (*__real_PPPGetInterface)(name);
6757 if (NULL == iface) return NULL; 6757 if (NULL == iface) return NULL;
6758 wrapper->real_iface = iface; 6758 wrapper->real_iface = iface;
6759 } 6759 }
6760 6760
6761 return wrapper->wrapped_iface; 6761 return wrapper->wrapped_iface;
6762 } 6762 }
OLDNEW
« no previous file with comments | « ppapi/cpp/private/content_decryptor_private.cc ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698