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

Unified Diff: media/blink/webcontentdecryptionmoduleaccess_impl.cc

Issue 872453002: Store the accumulated configuration from requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove 'override' entirely. 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 | « media/blink/webcontentdecryptionmoduleaccess_impl.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webcontentdecryptionmoduleaccess_impl.cc
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.cc b/media/blink/webcontentdecryptionmoduleaccess_impl.cc
index 9971829a3968cc6e4575ba9beb12fd0d8375d897..ec4e9194added92b6dcb5407db4501c732283a5a 100644
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.cc
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.cc
@@ -25,17 +25,20 @@ static void CreateCdm(CdmFactory* cdm_factory,
WebContentDecryptionModuleAccessImpl*
WebContentDecryptionModuleAccessImpl::Create(
const blink::WebString& key_system,
+ const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
CdmFactory* cdm_factory) {
- return new WebContentDecryptionModuleAccessImpl(key_system, security_origin,
- cdm_factory);
+ return new WebContentDecryptionModuleAccessImpl(key_system, configuration,
+ security_origin, cdm_factory);
}
WebContentDecryptionModuleAccessImpl::WebContentDecryptionModuleAccessImpl(
const blink::WebString& key_system,
+ const blink::WebMediaKeySystemConfiguration& configuration,
const blink::WebSecurityOrigin& security_origin,
CdmFactory* cdm_factory)
: key_system_(key_system),
+ configuration_(configuration),
security_origin_(security_origin),
cdm_factory_(cdm_factory) {
}
@@ -43,6 +46,11 @@ WebContentDecryptionModuleAccessImpl::WebContentDecryptionModuleAccessImpl(
WebContentDecryptionModuleAccessImpl::~WebContentDecryptionModuleAccessImpl() {
}
+blink::WebMediaKeySystemConfiguration
+WebContentDecryptionModuleAccessImpl::getConfiguration() {
+ return configuration_;
+}
+
void WebContentDecryptionModuleAccessImpl::createContentDecryptionModule(
blink::WebContentDecryptionModuleResult result) {
// This method needs to run asynchronously, as it may need to load the CDM.
« no previous file with comments | « media/blink/webcontentdecryptionmoduleaccess_impl.h ('k') | media/blink/webencryptedmediaclient_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698