| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // From private/ppb_content_decryptor_private.idl modified Wed Jan 7 16:48:10 | 5 // From private/ppb_content_decryptor_private.idl modified Mon Jan 12 17:33:29 |
| 6 // 2015. | 6 // 2015. |
| 7 | 7 |
| 8 #include "ppapi/c/pp_errors.h" | 8 #include "ppapi/c/pp_errors.h" |
| 9 #include "ppapi/c/private/ppb_content_decryptor_private.h" | 9 #include "ppapi/c/private/ppb_content_decryptor_private.h" |
| 10 #include "ppapi/shared_impl/tracked_callback.h" | 10 #include "ppapi/shared_impl/tracked_callback.h" |
| 11 #include "ppapi/thunk/enter.h" | 11 #include "ppapi/thunk/enter.h" |
| 12 #include "ppapi/thunk/ppapi_thunk_export.h" | 12 #include "ppapi/thunk/ppapi_thunk_export.h" |
| 13 | 13 |
| 14 namespace ppapi { | 14 namespace ppapi { |
| 15 namespace thunk { | 15 namespace thunk { |
| (...skipping 28 matching lines...) Expand all Loading... |
| 44 EnterInstance enter(instance); | 44 EnterInstance enter(instance); |
| 45 if (enter.failed()) | 45 if (enter.failed()) |
| 46 return; | 46 return; |
| 47 enter.functions()->PromiseRejected(instance, promise_id, exception_code, | 47 enter.functions()->PromiseRejected(instance, promise_id, exception_code, |
| 48 system_code, error_description); | 48 system_code, error_description); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void SessionMessage(PP_Instance instance, | 51 void SessionMessage(PP_Instance instance, |
| 52 struct PP_Var web_session_id, | 52 struct PP_Var web_session_id, |
| 53 PP_CdmMessageType message_type, | 53 PP_CdmMessageType message_type, |
| 54 struct PP_Var message) { | 54 struct PP_Var message, |
| 55 struct PP_Var legacy_destination_url) { |
| 55 VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()"; | 56 VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()"; |
| 56 EnterInstance enter(instance); | 57 EnterInstance enter(instance); |
| 57 if (enter.failed()) | 58 if (enter.failed()) |
| 58 return; | 59 return; |
| 59 enter.functions()->SessionMessage(instance, web_session_id, message_type, | 60 enter.functions()->SessionMessage(instance, web_session_id, message_type, |
| 60 message); | 61 message, legacy_destination_url); |
| 61 } | 62 } |
| 62 | 63 |
| 63 void SessionKeysChange(PP_Instance instance, | 64 void SessionKeysChange(PP_Instance instance, |
| 64 struct PP_Var web_session_id, | 65 struct PP_Var web_session_id, |
| 65 PP_Bool has_additional_usable_key, | 66 PP_Bool has_additional_usable_key, |
| 66 uint32_t key_count, | 67 uint32_t key_count, |
| 67 const struct PP_KeyInformation key_information[]) { | 68 const struct PP_KeyInformation key_information[]) { |
| 68 VLOG(4) << "PPB_ContentDecryptor_Private::SessionKeysChange()"; | 69 VLOG(4) << "PPB_ContentDecryptor_Private::SessionKeysChange()"; |
| 69 EnterInstance enter(instance); | 70 EnterInstance enter(instance); |
| 70 if (enter.failed()) | 71 if (enter.failed()) |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 | 192 |
| 192 } // namespace | 193 } // namespace |
| 193 | 194 |
| 194 PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_13* | 195 PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_13* |
| 195 GetPPB_ContentDecryptor_Private_0_13_Thunk() { | 196 GetPPB_ContentDecryptor_Private_0_13_Thunk() { |
| 196 return &g_ppb_contentdecryptor_private_thunk_0_13; | 197 return &g_ppb_contentdecryptor_private_thunk_0_13; |
| 197 } | 198 } |
| 198 | 199 |
| 199 } // namespace thunk | 200 } // namespace thunk |
| 200 } // namespace ppapi | 201 } // namespace ppapi |
| OLD | NEW |