Auto merge of #22874 - Manishearth:constraint, r=jdm

Add support for MediaTrackConstraints

This uses the WebIDL attributes-on-types support landed in https://github.com/servo/servo/pull/22958 to fill out the MediaTrackConstraints dictionary for constraints that servo-media supports.

r? @jdm

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22874)
<!-- Reviewable:end -->

1 files changed, 41 insertions, 43 deletions

diff --git a/components/script/dom/webidls/MediaDevices.webidl b/components/script/dom/webidls/MediaDevices.webidl
index 7fa30e0b916..866e1e964d0 100644
--- a/components/script/dom/webidls/MediaDevices.webidl
+++ b/components/script/dom/webidls/MediaDevices.webidl
@@ -23,31 +23,29 @@ partial interface MediaDevices {
 
 
 dictionary MediaStreamConstraints {
-    //         (boolean or MediaTrackConstraints) video = false;
-    //         (boolean or MediaTrackConstraints) audio = false;
-                boolean video = false;
-                boolean audio = false;
+        (boolean or MediaTrackConstraints) video = false;
+        (boolean or MediaTrackConstraints) audio = false;
 };
 
-// dictionary DoubleRange {
-//              double max;
-//              double min;
-// };
+dictionary DoubleRange {
+             double max;
+             double min;
+};
 
-// dictionary ConstrainDoubleRange : DoubleRange {
-//              double exact;
-//              double ideal;
-// };
+dictionary ConstrainDoubleRange : DoubleRange {
+             double exact;
+             double ideal;
+};
 
-// dictionary ULongRange {
-//              [Clamp] unsigned long max;
-//              [Clamp] unsigned long min;
-// };
+dictionary ULongRange {
+             [Clamp] unsigned long max;
+             [Clamp] unsigned long min;
+};
 
-// dictionary ConstrainULongRange : ULongRange {
-//              [Clamp] unsigned long exact;
-//              [Clamp] unsigned long ideal;
-// };
+dictionary ConstrainULongRange : ULongRange {
+             [Clamp] unsigned long exact;
+             [Clamp] unsigned long ideal;
+};
 
 // dictionary ConstrainBooleanParameters {
 //              boolean exact;
@@ -59,30 +57,30 @@ dictionary MediaStreamConstraints {
 //              (DOMString or sequence<DOMString>) ideal;
 // };
 
-// dictionary MediaTrackConstraints : MediaTrackConstraintSet {
-//              sequence<MediaTrackConstraintSet> advanced;
-// };
+dictionary MediaTrackConstraints : MediaTrackConstraintSet {
+             sequence<MediaTrackConstraintSet> advanced;
+};
 
-// typedef ([Clamp] unsigned long or ConstrainULongRange) ConstrainULong;
-// typedef (double or ConstrainDoubleRange) ConstrainDouble;
+typedef ([Clamp] unsigned long or ConstrainULongRange) ConstrainULong;
+typedef (double or ConstrainDoubleRange) ConstrainDouble;
 // typedef (boolean or ConstrainBooleanParameters) ConstrainBoolean;
 // typedef (DOMString or sequence<DOMString> or ConstrainDOMStringParameters) ConstrainDOMString;
 
-// dictionary MediaTrackConstraintSet {
-//              ConstrainULong width;
-//              ConstrainULong height;
-//              ConstrainDouble aspectRatio;
-//              ConstrainDouble frameRate;
-//              ConstrainDOMString facingMode;
-//              ConstrainDOMString resizeMode;
-//              ConstrainDouble volume;
-//              ConstrainULong sampleRate;
-//              ConstrainULong sampleSize;
-//              ConstrainBoolean echoCancellation;
-//              ConstrainBoolean autoGainControl;
-//              ConstrainBoolean noiseSuppression;
-//              ConstrainDouble latency;
-//              ConstrainULong channelCount;
-//              ConstrainDOMString deviceId;
-//              ConstrainDOMString groupId;
-// };
+dictionary MediaTrackConstraintSet {
+             ConstrainULong width;
+             ConstrainULong height;
+             ConstrainDouble aspectRatio;
+             ConstrainDouble frameRate;
+             // ConstrainDOMString facingMode;
+             // ConstrainDOMString resizeMode;
+             // ConstrainDouble volume;
+             ConstrainULong sampleRate;
+             // ConstrainULong sampleSize;
+             // ConstrainBoolean echoCancellation;
+             // ConstrainBoolean autoGainControl;
+             // ConstrainBoolean noiseSuppression;
+             // ConstrainDouble latency;
+             // ConstrainULong channelCount;
+             // ConstrainDOMString deviceId;
+             // ConstrainDOMString groupId;
+};