Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2066)

Unified Diff: media/blink/webcontentdecryptionmodule_impl.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: Fix DCHECK types. 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
« no previous file with comments | « media/blink/webcontentdecryptionmodule_impl.h ('k') | media/blink/webcontentdecryptionmoduleaccess_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webcontentdecryptionmodule_impl.cc
diff --git a/media/blink/webcontentdecryptionmodule_impl.cc b/media/blink/webcontentdecryptionmodule_impl.cc
index fbdc0dad1f2b8ee4579b8717cb596786831b8cae..9d6022017736d6a6c9fe5d5a9e35964aa7e892a3 100644
--- a/media/blink/webcontentdecryptionmodule_impl.cc
+++ b/media/blink/webcontentdecryptionmodule_impl.cc
@@ -24,8 +24,10 @@ namespace media {
void WebContentDecryptionModuleImpl::Create(
media::CdmFactory* cdm_factory,
- const blink::WebSecurityOrigin& security_origin,
const base::string16& key_system,
+ bool allow_distinctive_identifier,
+ bool allow_persistent_state,
+ const blink::WebSecurityOrigin& security_origin,
blink::WebContentDecryptionModuleResult result) {
DCHECK(!security_origin.isNull());
DCHECK(!key_system.empty());
@@ -65,7 +67,8 @@ void WebContentDecryptionModuleImpl::Create(
// TODO(jrummell): Pass WebContentDecryptionModuleResult (or similar) to
// Initialize() so that more specific errors can be reported.
if (!adapter->Initialize(cdm_factory, key_system_ascii,
- security_origin_as_gurl)) {
+ allow_distinctive_identifier,
+ allow_persistent_state, security_origin_as_gurl)) {
result.completeWithError(
blink::WebContentDecryptionModuleExceptionNotSupportedError, 0,
"Failed to initialize CDM.");
« no previous file with comments | « media/blink/webcontentdecryptionmodule_impl.h ('k') | media/blink/webcontentdecryptionmoduleaccess_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698