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

Unified Diff: Source/modules/encryptedmedia/MediaKeys.cpp

Issue 183943003: Verify MediaKeys parameter values consistently (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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 | « no previous file | Source/platform/drm/ContentDecryptionModule.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/MediaKeys.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeys.cpp b/Source/modules/encryptedmedia/MediaKeys.cpp
index d0e173a96c1859077feaaf9cfdbc00005c6e1bb6..54553353ef7b8fbc2614504c8851f430bda522da 100644
--- a/Source/modules/encryptedmedia/MediaKeys.cpp
+++ b/Source/modules/encryptedmedia/MediaKeys.cpp
@@ -53,7 +53,7 @@ PassRefPtrWillBeRawPtr<MediaKeys> MediaKeys::create(ExecutionContext* context, c
}
// 2. If keySystem is not one of the user agent's supported Key Systems, throw a NotSupportedError and abort these steps.
- if (!ContentDecryptionModule::supportsKeySystem(keySystem)) {
+ if (!isTypeSupported(keySystem, "")) {
ddorwin 2014/02/27 22:44:13 I don't think we should use the public function fo
jrummell 2014/02/27 23:20:00 Done.
exceptionState.throwDOMException(NotSupportedError, "The '" + keySystem + "' key system is not supported.");
return nullptr;
}
@@ -108,7 +108,7 @@ PassRefPtrWillBeRawPtr<MediaKeySession> MediaKeys::createSession(ExecutionContex
// 1. If type contains a MIME type that is not supported or is not supported by the keySystem,
// throw a NOT_SUPPORTED_ERR exception and abort these steps.
- if (!m_cdm->supportsMIMEType(contentType)) {
+ if (!isTypeSupported(m_keySystem, contentType)) {
ddorwin 2014/02/27 22:44:13 ~Ditto, except maybe step 4 of IST gets encapsulat
jrummell 2014/02/27 23:20:00 Done.
exceptionState.throwDOMException(NotSupportedError, "The type provided ('" + contentType + "') is unsupported.");
return nullptr;
}
« no previous file with comments | « no previous file | Source/platform/drm/ContentDecryptionModule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698