[css-font-loading] Replace [SetClass] with an explicit listing of Set methods, ugh.

Author: tabatkins

css-font-loading/Overview.bs

@@ -12,7 +12,7 @@ Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/
 Former Editor: John Daggett, Mozilla, jdaggett@mozilla.com
 Abstract: This CSS module describes events and interfaces used for dynamically loading font resources.
 Link Defaults: css-fonts-3 (descriptor) src, dom-core-ls (interface) event
-Ignored Terms: domstring, eventinit, cssfontfacerule, eventtarget, workerglobalscope, document, canvasproxy
+Ignored Terms: domstring, eventinit, cssfontfacerule, eventtarget, workerglobalscope, document, canvasproxy, iterator, unsigned long, set
 </pre>
 
 <h2 id="introduction">
@@ -359,9 +359,20 @@ The <code>FontFaceSet</code> Interface</h2>
 
 		enum FontFaceSetLoadStatus { "loading", "loaded" };
 
-		[SetClass(FontFace),
-		Exposed=Window,Worker]
+		callback ForEachCallback = void (FontFace font, long index, FontFaceSet self);
+
+		[Exposed=Window,Worker]
 		interface FontFaceSet {
+			// Emulate the Set interface, until we can extend Set correctly.
+			readonly attribute unsigned long size;
+			void add(FontFace font);
+			boolean has(FontFace font);
+			boolean delete(FontFace font);
+			void clear();
+			Iterator entries();
+			Iterator keys();
+			Iterator values();
+			void forEach(ForEachCallback cb, optional any thisArg);
 
 			// -- events for when loading state changes
 			attribute EventHandler onloading;
@@ -392,16 +403,43 @@ The <code>FontFaceSet</code> Interface</h2>
 			This attribute reflects the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ReadyPromise]]</a> slot.
 
 			See <a section href="#font-face-set-ready"></a> for more details on this <a idl>Promise</a> and its use.
+
+		<dt><dfn>size</dfn> <span attribute-info for=FontFaceSet/size></span>
+		<dd>
+			This attribute reflects the <code>size</code> attribute of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot.
+
+		<dt><dfn attribute for="FontFaceSet">status</dfn> <span attribute-info for="FontFaceSet/status"></span>
+		<dd>
+			If there are <a>possibly pending font loads</a>,
+			the <a attribute for=FontFaceSet>status</a> attribute must have the value <code>"loading"</code>.
+			Otherwise, it must have the value <code>"loaded"</code>.
 	</dl>
 
-	Note: The use of [SetClass] is controversial,
-	so this will be rewritten to instead be just a Set look-alike,
-	without use of [SetClass],
-	at least until we figure out how to do this kind of thing correctly.
+	<dl dfn-type=method dfn-for="FontFaceSet">
+		<dt><dfn title=add()>add</dfn>(<a idl>FontFace</a> font)
+		<dt><dfn title=has()>has</dfn>(<a idl>FontFace</a> font)
+		<dt><dfn title=delete()>delete</dfn>(<a idl>FontFace</a> font)
+		<dt><dfn title=clear()>clear</dfn>()
+		<dt><dfn title=entries()>entries</dfn>()
+		<dt><dfn title=keys()>keys</dfn>()
+		<dt><dfn title=values()>values</dfn>()
+		<dt><dfn title=forEach()>forEach</dfn>(<a idl>ForEachCallback</a> cb, optional any thisArg)
+		<dd>
+			All of these methods call the corresponding method of the <a idl>FontFaceSet</a>'s <a idl>[<!---->[ContainedFonts]]</a> slot
+			with the same arguments as were passed to them,
+			and return the value returned by the called method.
+	</dl>
 
-	The set entries for a <a interface>FontFaceSet</a> is initially an empty list.
-	A <a interface>FontFaceSet</a> attached to a document may have some initial <a interface>FontFace</a> objects prefilled in it;
-	see the section on <a href="#document-font-face-set">Interactions with CSS's @font-face Rule</a> for details.
+	<a interface>FontFaceSet</a> objects also have internal
+	<dfn attribute for=FontFaceSet>[<!---->[LoadingFonts]]</dfn>,
+	<dfn attribute for=FontFaceSet>[<!---->[LoadedFonts]]</dfn>,
+	<dfn attribute for=FontFaceSet>[<!---->[FailedFonts]]</dfn> slots,
+	all of which are initialized to the empty list,
+	a <dfn attribute for=FontFaceSet>[<!---->[ReadyPromise]]</dfn> slot,
+	which is initialized to a fresh pending <a idl>Promise</a>,
+	and a <dfn attribute for=FontFaceSet>[<!---->[ContainedFonts]]</dfn> slot,
+	which is initialized to an empty <a interface>Set</a> object
+	(though see <a section href="#document-font-face-set"></a> for information on how the Set may be pre-filled).
 
 	Because font families are loaded only when they are used,
 	content sometimes needs to understand when the loading of fonts occurs.
@@ -428,22 +466,6 @@ The <code>FontFaceSet</code> Interface</h2>
 	If any of the above conditions are false,
 	there are <dfn>possibly pending font loads</dfn>.
 
-	<dl>
-		<dt><dfn attribute for="FontFaceSet">status</dfn>, of type <a interface>DOMString</a>
-		<dd>
-			If there are <a>possibly pending font loads</a>,
-			the <a attribute for=FontFaceSet>status</a> attribute must have the value <code class="idl-code">"loading"</code>.
-			Otherwise, it must have the value <code class="idl-code">"loaded"</code>.
-	</dl>
-
-	<a interface>FontFaceSet</a> objects also have internal
-	<dfn attribute for=FontFaceSet>[<!---->[LoadingFonts]]</dfn>,
-	<dfn attribute for=FontFaceSet>[<!---->[LoadedFonts]]</dfn>,
-	<dfn attribute for=FontFaceSet>[<!---->[FailedFonts]]</dfn> slots,
-	all of which are initialized to the empty list,
-	and a <dfn attribute for=FontFaceSet>[<!---->[ReadyPromise]]</dfn> slot,
-	which is initialized to a fresh pending <a idl>Promise</a>.
-
 <h3 id='set-modifications'>
 Modifications of normal Set methods</h3>
 
@@ -717,7 +739,7 @@ The <code>check()</code> method</h3>
 
 		<li>
 			If the <var>font face list</var> contains no font faces,
-			return <code class="idl-code">false</code>.
+			return <code>false</code>.
 
 		<li>
 			If all fonts in the <var>font face list</var> have a <a attribute for=FontFace>status</a> attribute of "loaded",