content/renderer/pepper/pepper_plugin_instance_impl.h - Issue 811923002: Changes to support CDM_7

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/pepper_plugin_instance_impl.h

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

Patch Set: CrOS compile error 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d07bc230c61d407ed8690df1f79d89786472f3c4..e02928c95da8d17f28f796667fe1ee3f89e458ab 100644

--- a/content/renderer/pepper/pepper_plugin_instance_impl.h

+++ b/content/renderer/pepper/pepper_plugin_instance_impl.h

@@ -471,9 +471,6 @@ class CONTENT_EXPORT PepperPluginInstanceImpl

void PromiseResolvedWithSession(PP_Instance instance,

uint32 promise_id,

PP_Var web_session_id_var) override;

- void PromiseResolvedWithKeyIds(PP_Instance instance,

- uint32 promise_id,

- PP_Var key_ids_var) override;

void PromiseRejected(PP_Instance instance,

uint32 promise_id,

PP_CdmExceptionCode exception_code,

@@ -481,15 +478,17 @@ class CONTENT_EXPORT PepperPluginInstanceImpl

PP_Var error_description_var) override;

void SessionMessage(PP_Instance instance,

PP_Var web_session_id_var,

- PP_Var message_var,

- PP_Var destination_url_var) override;

- void SessionKeysChange(PP_Instance instance,

- PP_Var web_session_id_var,

- PP_Bool has_additional_usable_key) override;

+ PP_CdmMessageType message_type,

+ PP_Var message_var) override;

+ void SessionKeysChange(

+ PP_Instance instance,

+ PP_Var web_session_id_var,

+ PP_Bool has_additional_usable_key,

+ uint32_t key_count,

+ const struct PP_KeyInformation key_information[]) override;

void SessionExpirationChange(PP_Instance instance,

PP_Var web_session_id_var,

PP_Time new_expiry_time) override;

- void SessionReady(PP_Instance instance, PP_Var web_session_id_var) override;

void SessionClosed(PP_Instance instance, PP_Var web_session_id_var) override;

void SessionError(PP_Instance instance,

PP_Var web_session_id_var,

« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »