content/renderer/pepper/content_decryptor_delegate.h - Issue 105383002: Rename EME WD call parameters

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/content_decryptor_delegate.h

Issue 105383002: Rename EME WD call parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix nit Created 7 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

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

Index: content/renderer/pepper/content_decryptor_delegate.h

diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h

index 7e43c2b6458536df8581945379b90dcc9b482f1c..352817dd01170776d79e1f2dfad98b16667b3b09 100644

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

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

@@ -49,14 +49,14 @@ class ContentDecryptorDelegate {

const media::SessionErrorCB& session_error_cb);

// Provides access to PPP_ContentDecryptor_Private.

- bool CreateSession(uint32 reference_id,

+ bool CreateSession(uint32 session_id,

const std::string& type,

const uint8* init_data,

int init_data_length);

- bool UpdateSession(uint32 reference_id,

+ bool UpdateSession(uint32 session_id,

const uint8* response,

int response_length);

- bool ReleaseSession(uint32 reference_id);

+ bool ReleaseSession(uint32 session_id);

bool Decrypt(media::Decryptor::StreamType stream_type,

const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,

const media::Decryptor::DecryptCB& decrypt_cb);

@@ -80,13 +80,13 @@ class ContentDecryptorDelegate {

const media::Decryptor::VideoDecodeCB& video_decode_cb);

// PPB_ContentDecryptor_Private dispatching methods.

- void OnSessionCreated(uint32 reference_id, PP_Var session_id_var);

- void OnSessionMessage(uint32 reference_id,

+ void OnSessionCreated(uint32 session_id, PP_Var web_session_id_var);

+ void OnSessionMessage(uint32 session_id,

PP_Var message,

PP_Var destination_url);

- void OnSessionReady(uint32 reference_id);

- void OnSessionClosed(uint32 reference_id);

- void OnSessionError(uint32 reference_id,

+ void OnSessionReady(uint32 session_id);

+ void OnSessionClosed(uint32 session_id);

+ void OnSessionError(uint32 session_id,

int32_t media_error,

int32_t system_code);

void DeliverBlock(PP_Resource decrypted_block,