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

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

Issue 2681993002: EME: Allow case-insensitive parameter names in media MIME types (Closed)
Patch Set: 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
Index: third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
index 72795ee8ca2fb5d230211bb51b4460807e83aeaf..a896cabbb7fcd97b16218172cb617f04b2f3a283 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
@@ -4,6 +4,7 @@
#include "modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.h"
+#include <algorithm>
xhwang 2017/02/08 06:15:24 nit: add empty line here
jrummell 2017/02/08 21:10:14 Moving this was done by format. Done.
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptPromiseResolver.h"
#include "bindings/core/v8/ScriptState.h"
@@ -20,6 +21,7 @@
#include "platform/EncryptedMediaRequest.h"
#include "platform/Histogram.h"
#include "platform/network/ParsedContentType.h"
+#include "platform/network/mime/ContentType.h"
#include "public/platform/WebEncryptedMediaClient.h"
#include "public/platform/WebEncryptedMediaRequest.h"
#include "public/platform/WebMediaKeySystemConfiguration.h"
@@ -28,7 +30,6 @@
#include "wtf/PtrUtil.h"
#include "wtf/Vector.h"
#include "wtf/text/WTFString.h"
-#include <algorithm>
namespace blink {
@@ -50,9 +51,9 @@ static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities(
result[i].contentType = contentType;
if (isValidContentType(contentType)) {
// FIXME: Fail if there are unrecognized parameters.
xhwang 2017/02/08 06:15:24 Is there anything we could do with this FIXME?
jrummell 2017/02/08 21:10:14 Added bug link.
- ParsedContentType type(capabilities[i].contentType());
- result[i].mimeType = type.mimeType();
- result[i].codecs = type.parameterValueForName("codecs");
+ ContentType type(capabilities[i].contentType());
+ result[i].mimeType = type.type();
+ result[i].codecs = type.parameter("codecs");
}
result[i].robustness = capabilities[i].robustness();
}

Powered by Google App Engine
This is Rietveld 408576698