[css-font-loading] Tweak the 'when loading is done' bit to allow for the initial load to work correctly.

Author: tabatkins

css-font-loading/Overview.bs

@@ -475,7 +475,7 @@ The <code>FontFaceSet</code> Interface</h2>
 	and <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 <a idl>Promise</a> fulfilled with the <a idl>FontFaceSet</a>,
+	which is initialized to a fresh pending <a idl>Promise</a>,
 	and a <dfn attribute for=FontFaceSet>[<!---->[ContainedFonts]]</dfn> slot,
 	which is initialized by the <a constructor title="FontFaceSet()">FontFaceSet constructor</a> to a <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
@@ -611,8 +611,8 @@ Events</h3>
 			append them to <var>font face set's</var> <a attribute>[<!---->[FailedFonts]]</a> slot.
 	</ol>
 
-	If there are ever <a>no pending font loads</a>
-	and either of <var>font face set's</var> <a attribute>[<!---->[LoadedFonts]]</a> or <a attribute>[<!---->[FailedFonts]]</a> slots are not empty,
+	Whenever a <a interface>FontFaceSet</a> goes from having <a>possibly pending font loads</a>
+	to having <a>no pending font loads</a>,
 	user agents must run these steps:
 
 	<ol>
@@ -621,12 +621,14 @@ Events</h3>
 
 		<li>
 			<a>Fire a font load event</a> named <a event>loadingdone</a> at <var>font face set</var>
-			with the contents of <var>font face set's</var> <a attribute>[<!---->[LoadedFonts]]</a> slots, if any.
+			with the (possibly empty) contents of <var>font face set's</var> <a attribute>[<!---->[LoadedFonts]]</a> slot.
+			Reset the <a attribute>[<!---->[LoadedFonts]]</a> slot to an empty list.
 
 		<li>
 			If <var>font face set's</var> <a attribute>[<!---->[FailedFonts]]</a> slots is non-empty,
 			<a>fire a font load event</a> named <a event>loadingerror</a> at <var>font face set</var>
 			with the contents of <var>font face set's</var> <a attribute>[<!---->[FailedFonts]]</a> slot.
+			Reset the <a attribute>[<!---->[FailedFonts]]</a> slot to an empty list.
 
 		<li>
 			Fulfill <var>font face set's</var> <a attribute>[<!---->[ReadyPromise]]</a> attribute's value with <var>font face set</var>.

css-font-loading/Overview.html

@@ -586,7 +586,7 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
 	and <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=attribute data-export="" id=dom-fontfaceset-failedfonts>[[FailedFonts]]<a class=self-link href=#dom-fontfaceset-failedfonts></a></dfn> slots,
 	all of which are initialized to the empty list,
 	a <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=attribute data-export="" id=dom-fontfaceset-readypromise>[[ReadyPromise]]<a class=self-link href=#dom-fontfaceset-readypromise></a></dfn> slot,
-	which is initialized to a fresh <a data-link-type=idl href=#dom-promise title=promise>Promise</a> fulfilled with the <a data-link-type=idl href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>,
+	which is initialized to a fresh pending <a data-link-type=idl href=#dom-promise title=promise>Promise</a>,
 	and a <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=attribute data-export="" id=dom-fontfaceset-containedfonts>[[ContainedFonts]]<a class=self-link href=#dom-fontfaceset-containedfonts></a></dfn> slot,
 	which is initialized by the <a class=idl-code data-link-type=constructor href=#dom-fontfaceset-fontfaceset title=fontfaceset()>FontFaceSet constructor</a> to a <a class=idl-code data-link-type=interface title=set>Set</a> object
 	(though see <a data-section="" href=#document-font-face-set>§4.2 
@@ -715,8 +715,8 @@ <h3 class="heading settled heading" data-level=3.1 id=FontFaceSet-events><span c
 			append them to <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-failedfonts title=[[failedfonts]]>[[FailedFonts]]</a> slot.
 	</ol>
 
-<p>If there are ever <a data-link-type=dfn href=#no-pending-font-loads title="no pending font loads">no pending font loads</a>
-	and either of <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-loadedfonts title=[[loadedfonts]]>[[LoadedFonts]]</a> or <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-failedfonts title=[[failedfonts]]>[[FailedFonts]]</a> slots are not empty,
+<p>Whenever a <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> goes from having <a data-link-type=dfn href=#possibly-pending-font-loads title="possibly pending font loads">possibly pending font loads</a>
+	to having <a data-link-type=dfn href=#no-pending-font-loads title="no pending font loads">no pending font loads</a>,
 	user agents must run these steps:</p>
 
 	<ol>
@@ -725,12 +725,14 @@ <h3 class="heading settled heading" data-level=3.1 id=FontFaceSet-events><span c
 
 		<li>
 			<a data-link-type=dfn href=#fire-a-font-load-event title="fire a font load event">Fire a font load event</a> named <a class=idl-code data-link-type=event href=#dom-fontfaceset-loadingdone title=loadingdone>loadingdone</a> at <var>font face set</var>
-			with the contents of <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-loadedfonts title=[[loadedfonts]]>[[LoadedFonts]]</a> slots, if any.
+			with the (possibly empty) contents of <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-loadedfonts title=[[loadedfonts]]>[[LoadedFonts]]</a> slot.
+			Reset the <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-loadedfonts title=[[loadedfonts]]>[[LoadedFonts]]</a> slot to an empty list.
 
 		<li>
 			If <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-failedfonts title=[[failedfonts]]>[[FailedFonts]]</a> slots is non-empty,
 			<a data-link-type=dfn href=#fire-a-font-load-event title="fire a font load event">fire a font load event</a> named <a class=idl-code data-link-type=event href=#dom-fontfaceset-loadingerror title=loadingerror>loadingerror</a> at <var>font face set</var>
 			with the contents of <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-failedfonts title=[[failedfonts]]>[[FailedFonts]]</a> slot.
+			Reset the <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-failedfonts title=[[failedfonts]]>[[FailedFonts]]</a> slot to an empty list.
 
 		<li>
 			Fulfill <var>font face set’s</var> <a class=idl-code data-link-type=attribute href=#dom-fontfaceset-readypromise title=[[readypromise]]>[[ReadyPromise]]</a> attribute’s value with <var>font face set</var>.