merge

Author: dauwhe

css-animations/Overview.bs

@@ -20,7 +20,7 @@ Abstract: This CSS module describes a way for authors to animate the values of C
 
 At Risk: the <code>pseudoElement</code> property of the ''AnimationEvent'' interface
 
-Link Defaults: css-values-3 (type) <time>, cssom-1 (interface) cssstyledeclaration, dom-core-ls (interface) event, webidl (type) SyntaxError
+Link Defaults: css-values-3 (type) <time>, cssom-1 (interface) cssstyledeclaration, dom-core-ls (interface) event, webidl (type) SyntaxError, css-position-3 (property) left
 Ignored Terms: domstring, float, animationeventinit, event, eventinit, eventtarget, document
 </pre>
 
@@ -935,7 +935,7 @@ IDL Definition</h4>
 
 	  void            appendRule(DOMString rule);
 	  void            deleteRule(DOMString key);
-	  CSSKeyframeRule findRule(DOMString key);
+	  CSSKeyframeRule? findRule(DOMString key);
 	};
 	</pre>
 
@@ -993,9 +993,9 @@ The <code>deleteRule</code> method</h4>
 
 		<dt><dfn argument for="CSSKeyframesRule/deleteRule()">key</dfn> of type <a interface>DOMString</a>
 		<dd>
-			The key which describes the rule to be deleted. A percentage value between 
-            0% and 100%, or one of the keywords ''from'' or ''to'' which resolve to 0% and 
-            100%, respectively.
+			The keyframe selector of the rule to be deleted: a comma-separated list of either percentage values between 0% and 100% or one of the keywords ''from'' or ''to'', which resolve to 0% and 100%, respectively.
+
+            The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s).  The match is not sensitive to white-space.
 	</dl>
 
 	No Return Value
@@ -1016,9 +1016,9 @@ The <code>findRule</code> method</h4>
 	<dl>
 		<dt><dfn argument for="CSSKeyframesRule/findRule()">key</dfn> of type <a interface>DOMString</a>
 		<dd>
-			The key which describes the rule to be deleted. A percentage value between 
-            0% and 100%, or one of the keywords ''from'' or ''to'' which resolve to 0% and 
-            100%, respectively.	
+			The keyframe selector of the rule to be retrieved: a comma-separated list of either percentage values between 0% and 100% or one of the keywords ''from'' or ''to'', which resolve to 0% and 100%, respectively.
+
+            The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white-space.
     </dl>
 
 	Return Value:

css-animations/Overview.html

@@ -196,7 +196,14 @@ The Constructor</h3>
 	from a URL pointing to a font face file,
 	or from an ArrayBuffer (or ArrayBufferView) containing the binary representation of a font face.
 
-	When the <dfn method title='FontFace()' for=FontFace>FontFace</dfn>(DOMString <dfn argument for="FontFace/FontFace()">family</dfn>, (DOMString or {{BinaryData}}) <dfn argument for="FontFace/FontFace()">source</dfn>, {{FontFaceDescriptors}} <dfn argument for="FontFace/FontFace()">descriptors</dfn>) method is called,
+	When the <dfn constructor title='FontFace()' for=FontFace>FontFace</dfn>(
+	<span dfn-for="FontFace/FontFace(family, source, descriptors)">
+		DOMString <dfn argument>family</dfn>,
+		(DOMString or {{/BinaryData}}) <dfn argument>source</dfn>,
+		{{/FontFaceDescriptors}} <dfn argument>descriptors</dfn>
+	</span>
+	)
+	method is called,
 	execute these steps:
 
 	1. Let <var>font face</var> be a fresh {{FontFace}} object.
@@ -431,6 +438,8 @@ The <code>FontFaceSet</code> Interface</h2>
 		};
 	</pre>
 
+	{{FontFaceSet/load()}}
+
 	<div dfn-for="FontFaceSet">
 		: <dfn attribute>ready</dfn>
 		:: This attribute reflects the {{FontFaceSet}}'s {{[[ReadyPromise]]}} slot.
@@ -686,15 +695,20 @@ Events</h3>
 <h3 id='font-face-set-load'>
 The <code>load()</code> method</h3>
 
-	The {{FontFaceSet/load() method of {{FontFaceSet}} will determine whether all fonts in the given font list
+	The {{FontFaceSet/load()}} method of {{FontFaceSet}} will determine whether all fonts in the given font list
 	have been loaded and are available.
 	If any fonts are downloadable fonts and have not already been loaded,
 	the user agent will initiate the load of each of these fonts.
 	It returns a Promise,
 	which is fulfilled when all of the fonts are loaded and ready to be used,
 	or rejected if any font failed to load properly.
 
-	When the <dfn method for="FontFaceSet" title="load()">load</dfn>(<dfn argument for="FontFaceSet/load()">font</dfn>, <dfn argument for="FontFaceSet/load()">text</dfn>) method is called,
+	When the <dfn method for="FontFaceSet" title="load(font, text)">load</dfn>(
+	<span dfn-for="FontFaceSet/load(font, text)">
+		<dfn argument>font</dfn>,
+		<dfn argument>text</dfn>
+	</span>
+	) method is called,
 	execute these steps:
 
 	<ol>
@@ -741,13 +755,15 @@ The <code>load()</code> method</h3>
 <h3 id='font-face-set-check'>
 The <code>check()</code> method</h3>
 
-	The {{check()}} method of {{FontFaceSet}} will determine whether all fonts in the given font list
+	The {{FontFaceSet/check()}} method of {{FontFaceSet}} will determine whether all fonts in the given font list
 	have been loaded and are available.
 	If all fonts are available,
 	it returns true;
 	otherwise, it returns false.
 
-	When the <dfn method for="FontFaceSet" title="check()">check</dfn>(<dfn argument for="FontFaceSet/check()">font</dfn>, <dfn argument for="FontFaceSet/check()">text</dfn>) method is called,
+	When the <dfn method for="FontFaceSet" title="check(font, text)|check(font)">check</dfn>(
+	<span data-dfn-for="FontFaceSet/check(font, text)"><dfn argument>font</dfn>, <dfn argument>text</dfn>)</span>
+	method is called,
 	execute these steps:
 
 	<ol>