Skip to content

Commit 93d8559

Browse files
committed
[css-font-load-events] bikeshed updates
1 parent f8f6ec6 commit 93d8559

1 file changed

Lines changed: 18 additions & 18 deletions

File tree

css-font-load-events/Overview.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ <h3 class="heading settled heading" data-level=2.1 id=font-face-constructor><spa
265265
from a URL pointing to a font face file,
266266
or from an ArrayBuffer (or ArrayBufferView) containing the binary representation of a font face.
267267

268-
<p> When the <dfn class=idl-code data-dfn-for=FontFace data-dfn-type=method data-export="" data-link-type=idl id=dom-fontface-constructordomstring-family-domstring-or-binarydata-source-fontfacedescriptors-descriptors title=FontFace()>Constructor(DOMString <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-family>family<a class=self-link href=#dom-fontfacefontface-fontface-family></a></dfn>, (DOMString or <a data-link-type=idl href=#typedefdef-binarydata title=binarydata>BinaryData</a>) <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-source>source<a class=self-link href=#dom-fontfacefontface-fontface-source></a></dfn>, <a data-link-type=idl href=#dictdef-fontfacedescriptors title=fontfacedescriptors>FontFaceDescriptors</a> <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-descriptors>descriptors<a class=self-link href=#dom-fontfacefontface-fontface-descriptors></a></dfn>)<a class=self-link href=#dom-fontface-constructordomstring-family-domstring-or-binarydata-source-fontfacedescriptors-descriptors></a></dfn> method is called,
268+
<p> When the <dfn class=idl-code data-dfn-for=FontFace data-dfn-type=method data-export="" data-link-type=idl id=dom-fontface-fontface title=FontFace()>Constructor(DOMString <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-family>family<a class=self-link href=#dom-fontfacefontface-fontface-family></a></dfn>, (DOMString or <a data-link-type=idl href=#typedefdef-binarydata title=binarydata>BinaryData</a>) <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-source>source<a class=self-link href=#dom-fontfacefontface-fontface-source></a></dfn>, <a data-link-type=idl href=#dictdef-fontfacedescriptors title=fontfacedescriptors>FontFaceDescriptors</a> <dfn class=idl-code data-dfn-for="FontFace/FontFace() FontFace()" data-dfn-type=argument data-export="" id=dom-fontfacefontface-fontface-descriptors>descriptors<a class=self-link href=#dom-fontfacefontface-fontface-descriptors></a></dfn>)<a class=self-link href=#dom-fontface-fontface></a></dfn> method is called,
269269
execute these steps:
270270

271271
<ol data-link-type=idl>
@@ -436,15 +436,15 @@ <h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span
436436

437437
// Return the fonts that match the given "font" argument
438438
// and can render the given characters.
439-
sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-matchfont-text title=match()>match</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/match() data-link-type=argument href=#dom-fontfacesetmatch-match-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/match() data-link-type=argument href=#dom-fontfacesetmatch-match-text title=text>text</a> = " ");
439+
sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-match title=match()>match</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/match() data-link-type=argument href=#dom-fontfacesetmatch-match-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/match() data-link-type=argument href=#dom-fontfacesetmatch-match-text title=text>text</a> = " ");
440440

441441
// check and start loads if appropriate
442442
// and fulfill promise when all loads complete
443-
<a data-link-type=idl title=promise>Promise</a> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-loadfont-text title=load()>load</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/load() data-link-type=argument href=#dom-fontfacesetload-load-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/load() data-link-type=argument href=#dom-fontfacesetload-load-text title=text>text</a> = " ");
443+
<a data-link-type=idl title=promise>Promise</a> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-load title=load()>load</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/load() data-link-type=argument href=#dom-fontfacesetload-load-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/load() data-link-type=argument href=#dom-fontfacesetload-load-text title=text>text</a> = " ");
444444

445445
// return whether all fonts in the fontlist are loaded
446446
// (does not initiate load if not available)
447-
boolean <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-checkfont-text title=check()>check</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/check() data-link-type=argument href=#dom-fontfacesetcheck-check-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/check() data-link-type=argument href=#dom-fontfacesetcheck-check-text title=text>text</a> = " ");
447+
boolean <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-check title=check()>check</a>(DOMString <a class=idl-code data-link-for=FontFaceSet/check() data-link-type=argument href=#dom-fontfacesetcheck-check-font title=font>font</a>, optional DOMString <a class=idl-code data-link-for=FontFaceSet/check() data-link-type=argument href=#dom-fontfacesetcheck-check-text title=text>text</a> = " ");
448448

449449
// async notification that font loading and layout operations are done
450450
<a data-link-type=idl title=promise>Promise</a> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-ready title=ready()>ready</a>();
@@ -634,12 +634,12 @@ <h3 class="heading settled heading" data-level=3.2 id=FontFaceSet-events><span c
634634
<h3 class="heading settled heading" data-level=3.3 id=font-face-set-match><span class=secno>3.3 </span><span class=content>
635635
The <code>match()</code> method</span><a class=self-link href=#font-face-set-match></a></h3>
636636

637-
<p> The <a data-link-for=FontFaceSet data-link-type=functionish href=#dom-fontfaceset-matchfont-text title=match()>match()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> returns
637+
<p> The <a data-link-for=FontFaceSet data-link-type=functionish href=#dom-fontfaceset-match title=match()>match()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> returns
638638
the subset of <a data-link-type=dfn href=#available-font-faces title="available font faces">available font faces</a>
639639
that match a given <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-fonts-3/#propdef-font title=font>font</a> specifier
640640
and can render the given characters.
641641

642-
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-matchfont-text title=match()>match(<dfn class=idl-code data-dfn-for="FontFaceSet/match() match()" data-dfn-type=argument data-export="" id=dom-fontfacesetmatch-match-font>font<a class=self-link href=#dom-fontfacesetmatch-match-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/match() match()" data-dfn-type=argument data-export="" id=dom-fontfacesetmatch-match-text>text<a class=self-link href=#dom-fontfacesetmatch-match-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-matchfont-text></a></dfn> method is called,
642+
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-match title=match()>match(<dfn class=idl-code data-dfn-for="FontFaceSet/match() match()" data-dfn-type=argument data-export="" id=dom-fontfacesetmatch-match-font>font<a class=self-link href=#dom-fontfacesetmatch-match-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/match() match()" data-dfn-type=argument data-export="" id=dom-fontfacesetmatch-match-text>text<a class=self-link href=#dom-fontfacesetmatch-match-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-match></a></dfn> method is called,
643643
execute these steps:
644644

645645
<ol>
@@ -672,15 +672,15 @@ <h3 class="heading settled heading" data-level=3.3 id=font-face-set-match><span
672672
<h3 class="heading settled heading" data-level=3.4 id=font-face-set-load><span class=secno>3.4 </span><span class=content>
673673
The <code>load()</code> method</span><a class=self-link href=#font-face-set-load></a></h3>
674674

675-
<p> The <a data-link-for=FontFaceSet data-link-type=functionish href=#dom-fontfaceset-loadfont-text title=load()>load()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
675+
<p> The <a data-link-for=FontFaceSet data-link-type=functionish href=#dom-fontfaceset-load title=load()>load()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
676676
have been loaded and are available.
677677
If any fonts are downloadable fonts and have not already been loaded,
678678
the user agent will initiate the load of each of these fonts.
679679
It returns a Promise,
680680
which is fulfilled when all of the fonts are loaded and ready to be used,
681681
or rejected if any font failed to load properly.
682682

683-
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-loadfont-text title=load()>load(<dfn class=idl-code data-dfn-for="FontFaceSet/load() load()" data-dfn-type=argument data-export="" id=dom-fontfacesetload-load-font>font<a class=self-link href=#dom-fontfacesetload-load-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/load() load()" data-dfn-type=argument data-export="" id=dom-fontfacesetload-load-text>text<a class=self-link href=#dom-fontfacesetload-load-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-loadfont-text></a></dfn> method is called,
683+
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-load title=load()>load(<dfn class=idl-code data-dfn-for="FontFaceSet/load() load()" data-dfn-type=argument data-export="" id=dom-fontfacesetload-load-font>font<a class=self-link href=#dom-fontfacesetload-load-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/load() load()" data-dfn-type=argument data-export="" id=dom-fontfacesetload-load-text>text<a class=self-link href=#dom-fontfacesetload-load-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-load></a></dfn> method is called,
684684
execute these steps:
685685

686686
<ol data-link-type=idl>
@@ -693,10 +693,10 @@ <h3 class="heading settled heading" data-level=3.4 id=font-face-set-load><span c
693693
Complete the rest of these steps asynchronously.
694694

695695
<li>
696-
Call <var>font face set’s</var> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-matchfont-text title=match()>match()</a> method
696+
Call <var>font face set’s</var> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-match title=match()>match()</a> method
697697
with the same arguments as this method,
698698
and let <var>font face list</var> be the return value.
699-
If <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-matchfont-text title=match()>match()</a> threw an exception,
699+
If <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-match title=match()>match()</a> threw an exception,
700700
reject <var>promise</var> with that same exception and terminate these steps.
701701

702702
<li>
@@ -711,24 +711,24 @@ <h3 class="heading settled heading" data-level=3.4 id=font-face-set-load><span c
711711
<h3 class="heading settled heading" data-level=3.5 id=font-face-set-check><span class=secno>3.5 </span><span class=content>
712712
The <code>check()</code> method</span><a class=self-link href=#font-face-set-check></a></h3>
713713

714-
<p> The <a data-link-type=functionish href=#dom-fontfaceset-checkfont-text title=check()>check()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
714+
<p> The <a data-link-type=functionish href=#dom-fontfaceset-check title=check()>check()</a> method of <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> will determine whether all fonts in the given font list
715715
have been loaded and are available.
716716
If all fonts are available,
717717
it returns true;
718718
otherwise, it returns false.
719719

720-
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-checkfont-text title=check()>check(<dfn class=idl-code data-dfn-for="FontFaceSet/check() check()" data-dfn-type=argument data-export="" id=dom-fontfacesetcheck-check-font>font<a class=self-link href=#dom-fontfacesetcheck-check-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/check() check()" data-dfn-type=argument data-export="" id=dom-fontfacesetcheck-check-text>text<a class=self-link href=#dom-fontfacesetcheck-check-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-checkfont-text></a></dfn> method is called,
720+
<p> When the <dfn class=idl-code data-dfn-for=FontFaceSet data-dfn-type=method data-export="" id=dom-fontfaceset-check title=check()>check(<dfn class=idl-code data-dfn-for="FontFaceSet/check() check()" data-dfn-type=argument data-export="" id=dom-fontfacesetcheck-check-font>font<a class=self-link href=#dom-fontfacesetcheck-check-font></a></dfn>, <dfn class=idl-code data-dfn-for="FontFaceSet/check() check()" data-dfn-type=argument data-export="" id=dom-fontfacesetcheck-check-text>text<a class=self-link href=#dom-fontfacesetcheck-check-text></a></dfn>)<a class=self-link href=#dom-fontfaceset-check></a></dfn> method is called,
721721
execute these steps:
722722

723723
<ol>
724724
<li>
725725
Let <var>font face set</var> be the <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a> object this method was called on.
726726

727727
<li>
728-
Call <var>font face set’s</var> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-matchfont-text title=match()>match()</a> method
728+
Call <var>font face set’s</var> <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-match title=match()>match()</a> method
729729
with the same arguments as this method,
730730
and let <var>font face list</var> be the return value.
731-
If <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-matchfont-text title=match()>match()</a> threw an exception,
731+
If <a class=idl-code data-link-for=FontFaceSet data-link-type=method href=#dom-fontfaceset-match title=match()>match()</a> threw an exception,
732732
throw that same exception and terminate these steps.
733733

734734
<li>
@@ -1077,7 +1077,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
10771077
<div data-fill-with=index><ul class=indexlist>
10781078
<li>available font faces, <a href=#available-font-faces title="section 4">4</a>
10791079
<li>BinaryData, <a href=#typedefdef-binarydata title="section 2">2</a>
1080-
<li>check(), <a href=#dom-fontfaceset-checkfont-text title="section 3.5">3.5</a>
1080+
<li>check(), <a href=#dom-fontfaceset-check title="section 3.5">3.5</a>
10811081
<li>CSS-connected, <a href=#css-connected title="section 2.4">2.4</a>
10821082
<li>CSSFontFaceLoadEvent, <a href=#dom-cssfontfaceloadevent title="section 3">3</a>
10831083
<li>CSSFontFaceLoadEventInit, <a href=#dictdef-cssfontfaceloadeventinit title="section 3">3</a>
@@ -1093,7 +1093,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
10931093
<li>font, <a href=#dom-fontfacesetload-load-font title="section 3.4">3.4</a>
10941094
<li>font, <a href=#dom-fontfacesetcheck-check-font title="section 3.5">3.5</a>
10951095
<li>FontFace, <a href=#dom-fontface title="section 2">2</a>
1096-
<li>FontFace(), <a href=#dom-fontface-constructordomstring-family-domstring-or-binarydata-source-fontfacedescriptors-descriptors title="section 2.1">2.1</a>
1096+
<li>FontFace(), <a href=#dom-fontface-fontface title="section 2.1">2.1</a>
10971097
<li>FontFaceDescriptors, <a href=#dictdef-fontfacedescriptors title="section 2">2</a>
10981098
<li>FontFaceLoadStatus, <a href=#enumdef-fontfaceloadstatus title="section 2">2</a>
10991099
<li>fontfaces, <a href=#dom-cssfontfaceloadevent-fontfaces title="section 3">3</a>
@@ -1105,13 +1105,13 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
11051105
<li>font source, <a href=#font-source title="section 4">4</a>
11061106
<li>[[FontStatusPromise]], <a href=#dom-fontface-fontstatuspromise title="section 2">2</a>
11071107
<li>load(), <a href=#dom-fontface-load title="section 2.2">2.2</a>
1108-
<li>load(), <a href=#dom-fontfaceset-loadfont-text title="section 3.4">3.4</a>
1108+
<li>load(), <a href=#dom-fontfaceset-load title="section 3.4">3.4</a>
11091109
<li>[[LoadedFonts]], <a href=#dom-fontfaceset-loadedfonts title="section 3">3</a>
11101110
<li>loading, <a href=#dom-fontfaceset-loading title="section 3.2">3.2</a>
11111111
<li>loadingdone, <a href=#dom-fontfaceset-loadingdone title="section 3.2">3.2</a>
11121112
<li>loadingerror, <a href=#dom-fontfaceset-loadingerror title="section 3.2">3.2</a>
11131113
<li>[[LoadingFonts]], <a href=#dom-fontfaceset-loadingfonts title="section 3">3</a>
1114-
<li>match(), <a href=#dom-fontfaceset-matchfont-text title="section 3.3">3.3</a>
1114+
<li>match(), <a href=#dom-fontfaceset-match title="section 3.3">3.3</a>
11151115
<li>no pending font loads, <a href=#no-pending-font-loads title="section 3">3</a>
11161116
<li>onloading, <a href=#dom-fontfaceset-onloading title="section 3">3</a>
11171117
<li>onloadingdone, <a href=#dom-fontfaceset-onloadingdone title="section 3">3</a>

0 commit comments

Comments
 (0)