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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/blink/key_system_config_selector.cc

Issue 2652373002: EME: Fail requestMediaKeySystemAccess if no capabilities specified (Closed)
Patch Set: more changes Created 3 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
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/key_system_config_selector.cc
diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc
index 2e4024b9caa1aa4078c792339e45e6886d68bce2..441aed0f01a4ef5b262f5bada68bfbc197474331 100644
--- a/media/blink/key_system_config_selector.cc
+++ b/media/blink/key_system_config_selector.cc
@@ -670,8 +670,10 @@ KeySystemConfigSelector::GetSupportedConfiguration(
// 15. If the videoCapabilities and audioCapabilities members in candidate
// configuration are both empty, return NotSupported.
- // TODO(jrummell): Enforce this once the deprecation warning is removed.
- // See http://crbug.com/616233.
+ if (candidate.videoCapabilities.isEmpty() &&
+ candidate.audioCapabilities.isEmpty()) {
+ return CONFIGURATION_NOT_SUPPORTED;
+ }
// 16. If the videoCapabilities member in candidate configuration is
// non-empty:
« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/KeySystemTest.java ('k') | media/blink/key_system_config_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698