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

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
« no previous file with comments | « no previous file | media/cdm/ppapi/cdm_wrapper.cc » ('j') | media/cdm/ppapi/cdm_wrapper.cc » ('J')
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 94d89285de59a65022b5340ec116f7ee2db8ed09..32383d60dd530b30dffbb7ce4151e2eec87a567e 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -244,9 +244,12 @@ ContentDecryptorDelegate::~ContentDecryptorDelegate() {
}
void ContentDecryptorDelegate::Initialize(const std::string& key_system) {
- // TODO(ddorwin): Add an Initialize method to PPP_ContentDecryptor_Private.
DCHECK(!key_system.empty());
+ DCHECK(key_system_.empty());
key_system_ = key_system;
+ plugin_decryption_interface_->Initialize(
+ pp_instance_,
+ StringVar::StringToPPVar(key_system_));
}
void ContentDecryptorDelegate::SetKeyEventCallbacks(
@@ -267,7 +270,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 | « no previous file | media/cdm/ppapi/cdm_wrapper.cc » ('j') | media/cdm/ppapi/cdm_wrapper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698