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

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 11313016: Add "type" in GenerateKeyRequest() and OnNeedKey(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 8 years, 2 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: webkit/plugins/ppapi/ppapi_plugin_instance.cc
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 17ea71cc810e1280d1ea223fbbf7b08caf1cbf4a..fa095d0cb6d1088e341e2090461b88af1345a344 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1606,6 +1606,7 @@ void PluginInstance::set_decrypt_client(
}
bool PluginInstance::GenerateKeyRequest(const std::string& key_system,
+ const std::string& type,
const std::string& init_data) {
if (!LoadContentDecryptorInterface())
return false;
@@ -1616,6 +1617,7 @@ bool PluginInstance::GenerateKeyRequest(const std::string& key_system,
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
init_data.size(), init_data.data());
+ // TODO(tomfinegan): Pass "type" once PPP_ContentDecryptor_Private is updated.
plugin_decryption_interface_->GenerateKeyRequest(
pp_instance(),
StringVar::StringToPPVar(key_system),
« media/mp4/mp4_stream_parser_unittest.cc ('K') | « webkit/plugins/ppapi/ppapi_plugin_instance.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698