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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 833963003: Pass key_information on SessionKeysChange message (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ScopedVector Created 5 years, 11 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/media/crypto/ppapi_decryptor.cc ('k') | media/base/BUILD.gn » ('j') | media/base/cdm_key_information.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 7e72c93cae8218bc945faa7229a84d63f039294a..9face0788277e1a6963ef6b653a8368dbbde9f1f 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -13,6 +13,7 @@
#include "media/base/audio_buffer.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/bind_to_current_loop.h"
+#include "media/base/cdm_key_information.h"
#include "media/base/cdm_promise.h"
#include "media/base/channel_layout.h"
#include "media/base/data_buffer.h"
@@ -778,8 +779,10 @@ void ContentDecryptorDelegate::OnSessionKeysChange(
StringVar* web_session_id_string = StringVar::FromPPVar(web_session_id);
DCHECK(web_session_id_string);
+ // TODO(jrummell): Pass key information through Pepper.
session_keys_change_cb_.Run(web_session_id_string->value(),
- PP_ToBool(has_additional_usable_key));
+ PP_ToBool(has_additional_usable_key),
+ media::CdmKeysInfo());
}
void ContentDecryptorDelegate::OnSessionExpirationChange(
« no previous file with comments | « content/renderer/media/crypto/ppapi_decryptor.cc ('k') | media/base/BUILD.gn » ('j') | media/base/cdm_key_information.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698