ppapi/proxy/ppp_content_decryptor_private_proxy.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: ppapi/proxy/ppp_content_decryptor_private_proxy.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:

Index: ppapi/proxy/ppp_content_decryptor_private_proxy.h

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

index 217a9b9ed520d496ed6aecb6d8311612b2057196..398be63abc23b35c1e8781204f29c40c96175d8c 100644

--- a/ppapi/proxy/ppp_content_decryptor_private_proxy.h

+++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.h

@@ -36,13 +36,15 @@ class PPP_ContentDecryptor_Private_Proxy : public InterfaceProxy {

void OnMsgSetServerCertificate(PP_Instance instance,

uint32_t promise_id,

std::vector<uint8_t> server_certificate);

- void OnMsgCreateSession(PP_Instance instance,

- uint32_t promise_id,

- SerializedVarReceiveInput init_data_type,

- SerializedVarReceiveInput init_data,

- PP_SessionType session_type);

+ void OnMsgCreateSessionAndGenerateRequest(

+ PP_Instance instance,

+ uint32_t promise_id,

+ PP_SessionType session_type,

+ SerializedVarReceiveInput init_data_type,

+ SerializedVarReceiveInput init_data);

void OnMsgLoadSession(PP_Instance instance,

uint32_t promise_id,

+ PP_SessionType session_type,

SerializedVarReceiveInput web_session_id);

void OnMsgUpdateSession(PP_Instance instance,

uint32_t promise_id,

@@ -54,9 +56,6 @@ class PPP_ContentDecryptor_Private_Proxy : public InterfaceProxy {

void OnMsgRemoveSession(PP_Instance instance,

uint32_t promise_id,

const std::string& web_session_id);

- void OnMsgGetUsableKeyIds(PP_Instance instance,

- uint32_t promise_id,

- const std::string& web_session_id);

void OnMsgDecrypt(PP_Instance instance,

const PPPDecryptor_Buffer& encrypted_buffer,

const std::string& serialized_encrypted_block_info);