ppapi/proxy/ppb_instance_proxy.h - Issue 811923002: Changes to support CDM_7

Unified Diff: ppapi/proxy/ppb_instance_proxy.h

Issue 811923002: Changes to support CDM_7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: changes (plus rebase) Created 6 years 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

Index: ppapi/proxy/ppb_instance_proxy.h

diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h

index e45bccc93ed582d3d5f748cd1eede5addc627917..4bb4f630f57732f4714cdebad33e78f75fccb160 100644

--- a/ppapi/proxy/ppb_instance_proxy.h

+++ b/ppapi/proxy/ppb_instance_proxy.h

@@ -136,9 +136,6 @@ class PPB_Instance_Proxy : public InterfaceProxy,

virtual void PromiseResolvedWithSession(PP_Instance instance,

uint32 promise_id,

PP_Var web_session_id_var) override;

- virtual void PromiseResolvedWithKeyIds(PP_Instance instance,

- uint32 promise_id,

- PP_Var key_ids_var) override;

virtual void PromiseRejected(PP_Instance instance,

uint32 promise_id,

PP_CdmExceptionCode exception_code,

@@ -146,16 +143,15 @@ class PPB_Instance_Proxy : public InterfaceProxy,

PP_Var error_description_var) override;

virtual void SessionMessage(PP_Instance instance,

PP_Var web_session_id_var,

- PP_Var message_var,

- PP_Var destination_url_var) override;

+ PP_MessageType message_type,

+ PP_Var message_var) override;

virtual void SessionKeysChange(PP_Instance instance,

PP_Var web_session_id_var,

- PP_Bool has_additional_usable_key) override;

+ PP_Bool has_additional_usable_key,

+ PP_Var key_information_var) override;

virtual void SessionExpirationChange(PP_Instance instance,

PP_Var web_session_id_var,

PP_Time new_expiry_time) override;

- virtual void SessionReady(PP_Instance instance,

- PP_Var web_session_id_var) override;

virtual void SessionClosed(PP_Instance instance,

PP_Var web_session_id_var) override;

virtual void SessionError(PP_Instance instance,

@@ -269,30 +265,25 @@ class PPB_Instance_Proxy : public InterfaceProxy,

PP_Instance instance,

uint32_t promise_id,

SerializedVarReceiveInput web_session_id);

- virtual void OnHostMsgPromiseResolvedWithKeyIds(

- PP_Instance instance,

- uint32 promise_id,

- const std::vector<std::vector<uint8_t> >& key_ids);

virtual void OnHostMsgPromiseRejected(

PP_Instance instance,

uint32_t promise_id,

PP_CdmExceptionCode exception_code,

uint32_t system_code,

SerializedVarReceiveInput error_description);

- virtual void OnHostMsgSessionMessage(

+ virtual void OnHostMsgSessionMessage(PP_Instance instance,

+ SerializedVarReceiveInput web_session_id,

+ PP_MessageType message_type,

+ SerializedVarReceiveInput message);

+ virtual void OnHostMsgSessionKeysChange(

PP_Instance instance,

- SerializedVarReceiveInput web_session_id,

- SerializedVarReceiveInput message,

- SerializedVarReceiveInput destination_url);

- virtual void OnHostMsgSessionKeysChange(PP_Instance instance,

- const std::string& web_session_id,

- PP_Bool has_additional_usable_key);

+ const std::string& web_session_id,

+ PP_Bool has_additional_usable_key,

+ const std::vector<std::string>& serialized_key_ids);

virtual void OnHostMsgSessionExpirationChange(

PP_Instance instance,

const std::string& web_session_id,

PP_Time new_expiry_time);

- virtual void OnHostMsgSessionReady(PP_Instance instance,

- SerializedVarReceiveInput web_session_id);

virtual void OnHostMsgSessionClosed(PP_Instance instance,

SerializedVarReceiveInput web_session_id);

virtual void OnHostMsgSessionError(

« content/renderer/pepper/pepper_plugin_instance_impl.cc ('K') | « ppapi/proxy/ppapi_messages.h ('k') | ppapi/proxy/ppb_instance_proxy.cc » ('j') | ppapi/proxy/ppb_instance_proxy.cc » ('J')