content/renderer/pepper/pepper_plugin_instance_impl.h - Issue 265993002: Add Promises for EME (Chromium side)

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 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 8 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

« content/renderer/pepper/content_decryptor_delegate.h ('K') | « content/renderer/pepper/content_decryptor_delegate.cc ('k') | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | media/base/media_keys.h » ('J')
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 ec0a4529120a4d4acc5fb5fb982048b1b7d74860..69f36b666c7fbd74aadd125cd457fc9a896fd2e1 100644

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

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

@@ -444,20 +444,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_Var error_name_var,

+ 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_Var error_name_var,

+ 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;