ppapi/cpp/private/content_decryptor_private.cc - Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them.

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/cpp/private/content_decryptor_private.cc

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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

« ppapi/api/private/ppp_content_decryptor_private.idl ('K') | « ppapi/cpp/private/content_decryptor_private.h ('k') | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/cpp/private/content_decryptor_private.cc

diff --git a/ppapi/cpp/private/content_decryptor_private.cc b/ppapi/cpp/private/content_decryptor_private.cc

index 1e2666122e174597ac98c813d5d7f33676c2056c..a19175388200deb5efb077ace567859dca22ec88 100644

--- a/ppapi/cpp/private/content_decryptor_private.cc

+++ b/ppapi/cpp/private/content_decryptor_private.cc

@@ -25,7 +25,9 @@ static const char kPPPContentDecryptorInterface[] =

PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE;

void Initialize(PP_Instance instance,

- PP_Var key_system_arg) {

+ PP_Var key_system_arg,

+ PP_Bool allow_distinctive_identifier,

+ PP_Bool allow_persistent_state) {

void* object =

Instance::GetPerInstanceObject(instance, kPPPContentDecryptorInterface);

if (!object)

@@ -36,7 +38,9 @@ void Initialize(PP_Instance instance,

return;

static_cast<ContentDecryptor_Private*>(object)->Initialize(

- key_system_var.AsString());

+ key_system_var.AsString(),

+ PP_ToBool(allow_distinctive_identifier),

+ PP_ToBool(allow_persistent_state));

}

void SetServerCertificate(PP_Instance instance,