Constraints: Make advanced list be a list.

third_party/WebKit/Source/modules/mediastream/MediaConstraintsImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 416 matching lines @@
 static WebMediaConstraints createFromNamedConstraints(ExecutionContext* context, WebVector<WebMediaConstraint>& mandatory, const WebVector<WebMediaConstraint>& optional, MediaErrorState& errorState)
 {
     WebMediaTrackConstraintSet basic;
     WebMediaTrackConstraintSet advanced;
     WebMediaConstraints constraints;
     parseOldStyleNames(context, mandatory, true, basic, errorState);
     if (errorState.hadException())
         return constraints;
     // We ignore unknow names and syntax errors in optional constraints.
     MediaErrorState ignoredErrorState;
-    parseOldStyleNames(context, optional, false, advanced, ignoredErrorState);
-    if (advanced.isEmpty()) {
-        WebVector<WebMediaTrackConstraintSet> emptyVector;
-        constraints.initialize(basic, emptyVector);
-    } else {
-        WebVector<WebMediaTrackConstraintSet> advancedVector(&advanced, 1);
-        constraints.initialize(basic, advancedVector);
+    Vector<WebMediaTrackConstraintSet> advancedVector;
+    for (const auto& optionalConstraint : optional) {
+        WebMediaTrackConstraintSet advancedElement;
+        WebVector<WebMediaConstraint> elementAsList(&optionalConstraint, 1);
+        parseOldStyleNames(context, elementAsList, false, advancedElement, ignoredErrorState);
+        if (!advancedElement.isEmpty())
+            advancedVector.append(advancedElement);
     }
+    constraints.initialize(basic, advancedVector);
     return constraints;
 }
 
 // Deprecated.
 WebMediaConstraints create(ExecutionContext* context, const Dictionary& constraintsDictionary, MediaErrorState& errorState)
 {
     WebVector<WebMediaConstraint> optional;
     WebVector<WebMediaConstraint> mandatory;
     if (!parse(constraintsDictionary, optional, mandatory)) {
         errorState.throwTypeError("Malformed constraints object.");
@@ skipping 127 matching lines @@
 
 WebMediaConstraints create()
 {
     WebMediaConstraints constraints;
     constraints.initialize();
     return constraints;
 }
 
 } // namespace MediaConstraintsImpl
 } // namespace blink