EME: Allow case-insensitive parameter names in media MIME types

third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/Deprecation.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/encryptedmedia/EncryptedMediaUtils.h"
 #include "modules/encryptedmedia/MediaKeySession.h"
 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #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"
 #include "public/platform/WebMediaKeySystemMediaCapability.h"
 #include "public/platform/WebVector.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
-#include <algorithm>
 
 namespace blink {
 
 namespace {
 
 static WebVector<WebEncryptedMediaInitDataType> convertInitDataTypes(
     const Vector<String>& initDataTypes) {
   WebVector<WebEncryptedMediaInitDataType> result(initDataTypes.size());
   for (size_t i = 0; i < initDataTypes.size(); ++i)
     result[i] = EncryptedMediaUtils::convertToInitDataType(initDataTypes[i]);
   return result;
 }
 
 static WebVector<WebMediaKeySystemMediaCapability> convertCapabilities(
     const HeapVector<MediaKeySystemMediaCapability>& capabilities) {
   WebVector<WebMediaKeySystemMediaCapability> result(capabilities.size());
   for (size_t i = 0; i < capabilities.size(); ++i) {
     const WebString& contentType = capabilities[i].contentType();
     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();
   }
   return result;
 }
 
 static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement(
     const String& requirement) {
   if (requirement == "required")
     return WebMediaKeySystemConfiguration::Requirement::Required;
@@ skipping 297 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink