| Index: content/renderer/pepper/pepper_plugin_instance_impl.h
|
| diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h
|
| index 9d067a94a0e51ca5e9623c02398ae02cc0f529f4..5568a226bae98449f459cbcee2c8221cc89ba923 100644
|
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.h
|
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
|
| @@ -447,20 +447,29 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
|
| OVERRIDE;
|
|
|
| // PPB_ContentDecryptor_Private implementation.
|
| - virtual void SessionCreated(PP_Instance instance,
|
| - uint32_t session_id,
|
| - PP_Var web_session_id_var) OVERRIDE;
|
| + virtual void PromiseResolved(PP_Instance instance,
|
| + uint32 promise_id) OVERRIDE;
|
| + virtual void PromiseResolvedWithSession(PP_Instance instance,
|
| + uint32 promise_id,
|
| + PP_Var web_session_id_var) OVERRIDE;
|
| + virtual void PromiseRejected(PP_Instance instance,
|
| + uint32 promise_id,
|
| + PP_ExceptionCode exception_code,
|
| + uint32 system_code,
|
| + PP_Var error_description_var) OVERRIDE;
|
| virtual void SessionMessage(PP_Instance instance,
|
| - uint32_t session_id,
|
| - PP_Var message,
|
| - PP_Var destination_url) OVERRIDE;
|
| - virtual void SessionReady(PP_Instance instance, uint32_t session_id) OVERRIDE;
|
| + PP_Var web_session_id_var,
|
| + PP_Var message_var,
|
| + PP_Var destination_url_var) OVERRIDE;
|
| + virtual void SessionReady(PP_Instance instance,
|
| + PP_Var web_session_id_var) OVERRIDE;
|
| virtual void SessionClosed(PP_Instance instance,
|
| - uint32_t session_id) OVERRIDE;
|
| + PP_Var web_session_id_var) OVERRIDE;
|
| virtual void SessionError(PP_Instance instance,
|
| - uint32_t session_id,
|
| - int32_t media_error,
|
| - uint32_t system_code) OVERRIDE;
|
| + PP_Var web_session_id_var,
|
| + PP_ExceptionCode exception_code,
|
| + uint32 system_code,
|
| + PP_Var error_description_var) OVERRIDE;
|
| virtual void DeliverBlock(PP_Instance instance,
|
| PP_Resource decrypted_block,
|
| const PP_DecryptedBlockInfo* block_info) OVERRIDE;
|
|
|