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

Unified Diff: media/cdm/default_cdm_factory.cc

Issue 1068823003: Pass security origin to AesDecryptor() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add GN dependency Created 5 years, 8 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 | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/default_cdm_factory.cc
diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc
index 9d8ea83edcccb07ad05874bdc082900988be74ac..a87760c1284ee777045d08c1ae053bf713948935 100644
--- a/media/cdm/default_cdm_factory.cc
+++ b/media/cdm/default_cdm_factory.cc
@@ -6,6 +6,7 @@
#include "media/base/key_systems.h"
#include "media/cdm/aes_decryptor.h"
+#include "url/gurl.h"
namespace media {
@@ -25,9 +26,13 @@ scoped_ptr<MediaKeys> DefaultCdmFactory::Create(
const LegacySessionErrorCB& legacy_session_error_cb,
const SessionKeysChangeCB& session_keys_change_cb,
const SessionExpirationUpdateCB& session_expiration_update_cb) {
+ if (!security_origin.is_valid())
+ return nullptr;
+
if (CanUseAesDecryptor(key_system)) {
- return make_scoped_ptr(new AesDecryptor(
- session_message_cb, session_closed_cb, session_keys_change_cb));
+ return make_scoped_ptr(new AesDecryptor(security_origin, session_message_cb,
+ session_closed_cb,
+ session_keys_change_cb));
}
return nullptr;
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698