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

Unified Diff: media/blink/webencryptedmediaclient_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.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webencryptedmediaclient_impl.cc
diff --git a/media/blink/webencryptedmediaclient_impl.cc b/media/blink/webencryptedmediaclient_impl.cc
index af7b7f487a99cc44cf5254257835e1d4c8fbdfe9..dd1eaaca851e7a86b5fb319d2c2f9bd26c144534 100644
--- a/media/blink/webencryptedmediaclient_impl.cc
+++ b/media/blink/webencryptedmediaclient_impl.cc
@@ -160,34 +160,30 @@ void WebEncryptedMediaClientImpl::requestMediaKeySystemAccess(
}
// 7.2 Let implementation be the implementation of keySystem.
- // 7.3 Follow the steps for the first matching condition from the following
- // list:
- // - If supportedConfigurations was not provided, run the Is Key System
- // Supported? algorithm and if successful, resolve promise with access
- // and abort these steps.
- // TODO(sandersd): Remove pending the resolution of
- // https://github.com/w3c/encrypted-media/issues/1.
+ // 7.3 For each value in supportedConfigurations, run the GetSupported
+ // Configuration algorithm and if successful, resolve promise with access
+ // and abort these steps.
const blink::WebVector<blink::WebMediaKeySystemConfiguration>&
configurations = request.supportedConfigurations();
+
+ // TODO(sandersd): Remove once Blink requires the configurations parameter for
+ // requestMediaKeySystemAccess().
if (configurations.isEmpty()) {
request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
- request.keySystem(), request.securityOrigin(), cdm_factory_.get()));
+ request.keySystem(), blink::WebMediaKeySystemConfiguration(),
+ request.securityOrigin(), cdm_factory_.get()));
return;
}
- // - Otherwise, for each value in supportedConfigurations, run the
- // GetSuppored Configuration algorithm and if successful, resolve
- // promise with access and abort these steps.
for (size_t i = 0; i < configurations.size(); i++) {
const blink::WebMediaKeySystemConfiguration& candidate = configurations[i];
blink::WebMediaKeySystemConfiguration accumulated_configuration;
if (GetSupportedConfiguration(key_system, candidate,
request.securityOrigin(),
&accumulated_configuration)) {
- // TODO(sandersd): Pass the accumulated configuration along.
- // http://crbug.com/447059.
request.requestSucceeded(WebContentDecryptionModuleAccessImpl::Create(
- request.keySystem(), request.securityOrigin(), cdm_factory_.get()));
+ request.keySystem(), accumulated_configuration,
+ request.securityOrigin(), cdm_factory_.get()));
return;
}
}
« no previous file with comments | « media/blink/webcontentdecryptionmoduleaccess_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698