Bug 26654 (Part 2: Webidl in Constrainable)

getusermedia.html

@@ -1231,7 +1231,7 @@ <h3>Interface Definition</h3>
                 </code> method is the DOM manipulation task source.</p>
             </dd>
 
-            <dt>Capabilities getCapabilities()</dt>
+            <dt>MediaTrackConstraintSet getCapabilities()</dt>
 
             <dd>
               <p>See <a href="#constrainable-interface">ConstrainablePattern
@@ -1243,10 +1243,12 @@ <h3>Interface Definition</h3>
             <dd>See <a href="#constrainable-interface">ConstrainablePattern
             Interface</a> for the definition of this method. </dd>
 
-            <dt>Settings getSettings()</dt>
+            <dt>MediaTrackConstraintSet getSettings()</dt>
 
             <dd>See <a href="#constrainable-interface">ConstrainablePattern
-            Interface</a> for the definition of this method. </dd>
+            Interface</a> for the definition of this method. The returned <code>
+              <a>MediaTrackConstraintSet</a></code> MUST contain bare values only.
+            </dd>
 
             <dt>void applyConstraints()</dt>
 
@@ -2783,13 +2785,14 @@ <h3>MediaDevices Interface Extensions</h3>
         recognizes.</p>
 
         <dl class="idl" title="partial interface MediaDevices">
-          <dt>static Dictionary getSupportedConstraints(DOMString kind)</dt>
+          <dt>static MediaTrackConstraintSet getSupportedConstraints(DOMString kind)</dt>
 
           <dd>
-            <p>Returns a dictionary whose members are the constraint keys
+            <p>Returns a <code><a>MediaTrackConstraintSet
+            </a></code> dictionary whose members are the constraints
             known to the User Agent for the kind given as argument. A
             supported constraint MUST be represented by a member whose name is
-            the constraint name and whose value is <code>true</code>. Any
+            the constraint name and whose value is truthy. Any
             constraint names not supported by the User Agent MUST not be
             present in the returned dictionary.</p>
           </dd>
@@ -3939,8 +3942,9 @@ <h2>The Property Registry</h2>
 
       <section id="capabilities">
         <h3>Capabilities</h3>
-
-        <p><dfn>Capabilities</dfn> is a dictionary containing one or more
+        <p><dfn>Capabilities</dfn> is a
+        <a href="#idl-def-ConstraintSet">ConstraintSet</a>
+        dictionary containing one or more
         key-value pairs, where each key <em class="rfc2119"
         title="must">must</em> be a constrainable property defined in the
         registry, and each value <em class="rfc2119" title="should">must</em>
@@ -3978,7 +3982,8 @@ <h3>
           <dfn>Settings</dfn>
         </h3>
 
-        <p><dfn>Settings</dfn> is a dictionary containing one or more
+        <p><dfn>Settings</dfn> is a bare-values-only subset of a <a
+        href="#idl-def-ConstraintSet">ConstraintSet</a> dictionary containing one or more
         key-value pairs. It <em class="rfc2119" title="must">must</em> contain
         each key returned in <code>getCapabilities()</code>. There <em
         class="rfc2119" title="must">must</em> be a single value for each key
@@ -4013,8 +4018,9 @@ <h3>
         Constrainable Pattern cannnot simply subclass Constraints and
         ConstraintSet as they are defined here. Instead they must provide
         their own definitions that follow this pattern. See <a
-        href="#media-track-constraints"> MediaTrackConstraints</a> for an
-        example of this.</p>
+        href="#media-track-constraints">MediaTrackConstraints</a> and <a
+        href="#idl-def-MediaTrackConstraintSet">MediaTrackConstraintSet</a>
+        for an example of this.</p>
 
         <dl class="idl" title="dictionary ConstraintSet">
         </dl>