media/blink/cdm_session_adapter.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: media/blink/cdm_session_adapter.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

« media/blink/cdm_session_adapter.h ('K') | « media/blink/cdm_session_adapter.h ('k') | media/blink/webcontentdecryptionmodule_impl.h » ('j') | media/blink/webcontentdecryptionmodule_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/cdm_session_adapter.cc

diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc

index f02ff4ede5df9044cb6fcde5ffa6ae1ecba319ac..747f73eb2813ecf9e4fa0bb09b4779ee7022216f 100644

--- a/media/blink/cdm_session_adapter.cc

+++ b/media/blink/cdm_session_adapter.cc

@@ -28,6 +28,8 @@ CdmSessionAdapter::~CdmSessionAdapter() {}

bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,

const std::string& key_system,

+ bool allow_distinctive_identifier,

+ bool allow_persistent_state,

const GURL& security_origin) {

key_system_ = key_system;

key_system_uma_prefix_ =

@@ -35,7 +37,8 @@ bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory,

base::WeakPtr<CdmSessionAdapter> weak_this = weak_ptr_factory_.GetWeakPtr();

media_keys_ = cdm_factory->Create(

- key_system, security_origin,

+ key_system, allow_distinctive_identifier, allow_persistent_state,

+ security_origin,

base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),

base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),

base::Bind(&CdmSessionAdapter::OnSessionError, weak_this),