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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.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 | « content/renderer/pepper/content_decryptor_delegate.h ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index 8be0fba8a08461ba7930315082aa5c6900f4f803..63ab8184b73be76a3c49b4e0c9548a1a0be5086f 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -352,9 +352,10 @@ ContentDecryptorDelegate::~ContentDecryptorDelegate() {
SatisfyAllPendingCallbacksOnError();
}
-// TODO(jrummell): Remove |session_ready_cb| and |session_keys_change_cb|.
void ContentDecryptorDelegate::Initialize(
const std::string& key_system,
+ bool allow_distinctive_identifier,
+ bool allow_persistent_state,
const media::SessionMessageCB& session_message_cb,
const media::SessionClosedCB& session_closed_cb,
const media::SessionErrorCB& session_error_cb,
@@ -373,7 +374,9 @@ void ContentDecryptorDelegate::Initialize(
fatal_plugin_error_cb_ = fatal_plugin_error_cb;
plugin_decryption_interface_->Initialize(
- pp_instance_, StringVar::StringToPPVar(key_system_));
+ pp_instance_, StringVar::StringToPPVar(key_system_),
+ PP_FromBool(allow_distinctive_identifier),
+ PP_FromBool(allow_persistent_state));
}
void ContentDecryptorDelegate::InstanceCrashed() {
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.h ('k') | media/base/cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698