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

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

Issue 131653003: Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 26873ef9a9cdff7250cf19b0b140362f1f9b0a1a..37a9e7af63ecc3fe05c2ea66e798daa9aafcf1c1 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -286,17 +286,25 @@ void ContentDecryptorDelegate::InstanceCrashed() {
}
bool ContentDecryptorDelegate::CreateSession(uint32 session_id,
- const std::string& type,
+ const std::string& content_type,
const uint8* init_data,
int init_data_length) {
PP_Var init_data_array =
PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
init_data_length, init_data);
- plugin_decryption_interface_->CreateSession(pp_instance_,
- session_id,
- StringVar::StringToPPVar(type),
- init_data_array);
+ plugin_decryption_interface_->CreateSession(
+ pp_instance_,
+ session_id,
+ StringVar::StringToPPVar(content_type),
+ init_data_array);
+ return true;
+}
+
+bool ContentDecryptorDelegate::LoadSession(uint32 session_id,
+ const std::string& web_session_id) {
+ plugin_decryption_interface_->LoadSession(
+ pp_instance_, session_id, StringVar::StringToPPVar(web_session_id));
return true;
}

Powered by Google App Engine
This is Rietveld 408576698