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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 24192004: Changes to the EME Pepper API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 3 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
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 94d89285de59a65022b5340ec116f7ee2db8ed09..ce910379015657c09dd9e858aeaf56c31594b078 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -243,10 +243,16 @@ ContentDecryptorDelegate::ContentDecryptorDelegate(
ContentDecryptorDelegate::~ContentDecryptorDelegate() {
}
-void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
- // TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
+void ContentDecryptorDelegate::Initialize(const std::string& key_system,
+ bool can_challenge_platform) {
DCHECK(!key_system.empty());
+ DCHECK(key_system_.empty());
key_system_ = key_system;
+
+ plugin_decryption_interface_->Initialize(
+ pp_instance_,
+ StringVar::StringToPPVar(key_system_),
+ PP_FromBool(can_challenge_platform));
}
void ContentDecryptorDelegate::SetKeyEventCallbacks(
@@ -267,7 +273,6 @@ bool ContentDecryptorDelegate::GenerateKeyRequest(const std::string& type,
plugin_decryption_interface_->GenerateKeyRequest(
pp_instance_,
- StringVar::StringToPPVar(key_system_), // TODO(ddorwin): Remove.
StringVar::StringToPPVar(type),
init_data_array);
return true;
« no previous file with comments | « content/renderer/pepper/content_decryptor_delegate.h ('k') | content/renderer/pepper/pepper_plugin_instance_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698