[eme] Ignore capabilities with unrecognized parameters

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>
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 35 matching lines @@
 }
 
 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;
     ParsedContentType type(contentType);
     if (type.isValid()) {
-      // FIXME: Fail if there are unrecognized parameters.
-      // http://crbug.com/690131
+      // Fail if there are unrecognized parameters. There is no way to

[xhwang, 2017/03/03 23:20:58]

"Fail" isn't accurate since we just skip it..

[xhwang, 2017/03/03 23:20:58]

Please quote the spec here:

"If the user agent does not recognize one or more parameters" in a capability,
skip over it etc

[jrummell, 2017/03/04 00:48:25]

Removed.

[jrummell, 2017/03/04 00:48:26]

Done.

+      // enumerate the parameters, so only look up "codecs" if a single
+      // parameter is available. Chromium expects "codecs" to be valid, so

[xhwang, 2017/03/03 23:20:58]

ooc, what if we have two "codecs" parameters? 

[jrummell, 2017/03/04 00:48:25]

ParsedContentType only returns the last one, so it would appear to have only 1
parameter. Opened http://crbug.com/698436.

+      // this capability will fail if codecs not the only parameter specified.

[xhwang, 2017/03/03 23:20:58]

again, s/fail/skip, also s/not/is not/

[jrummell, 2017/03/04 00:48:25]

Done.

       result[i].mimeType = type.mimeType();
-      result[i].codecs = type.parameterValueForName("codecs");
+      if (type.parameterCount() == 1u)
+        result[i].codecs = type.parameterValueForName("codecs");
     }
     result[i].robustness = capabilities[i].robustness();
   }
   return result;
 }
 
 static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement(
     const String& requirement) {
   if (requirement == "required")
     return WebMediaKeySystemConfiguration::Requirement::Required;
@@ skipping 255 matching lines @@
   WebEncryptedMediaClient* mediaClient =
       controller->encryptedMediaClient(executionContext);
   mediaClient->requestMediaKeySystemAccess(
       WebEncryptedMediaRequest(initializer));
 
   // 7. Return promise.
   return promise;
 }
 
 }  // namespace blink