Skip to content

Commit 48353a7

Browse files
tabatkinstabatkins
committed
[css-font-loading] Rename the LoadEvent stuff to use FontFaceSet rather than CSSFontFace in the name.
1 parent d857c46 commit 48353a7

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎css-font-loading/Overview.bs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,13 @@ Interaction with CSS’s ''@font-face'' Rule</h3>
355355
The <code>FontFaceSet</code> Interface</h2>
356356

357357
<pre class="idl">
358-
dictionary CSSFontFaceLoadEventInit : EventInit {
358+
dictionary FontFaceSetLoadEventInit : EventInit {
359359
sequence&lt;FontFace> fontfaces = [];
360360
};
361361

362-
[Constructor(DOMString type, optional CSSFontFaceLoadEventInit eventInitDict),
362+
[Constructor(DOMString type, optional FontFaceSetLoadEventInit eventInitDict),
363363
Exposed=Window,Worker]
364-
interface CSSFontFaceLoadEvent : Event {
364+
interface FontFaceSetLoadEvent : Event {
365365
readonly attribute sequence&lt;FontFace> fontfaces;
366366
};
367367

@@ -536,7 +536,7 @@ Events</h3>
536536
with optional <var>font faces</var>
537537
means to
538538
<a href="http://www.w3.org/TR/html5/webappapis.html#event-firing">fire a simple event</a> named <var>e</var>
539-
using the <a interface>CSSFontFaceLoadEvent</a> interface that also meets these conditions:
539+
using the <a interface>FontFaceSetLoadEvent</a> interface that also meets these conditions:
540540

541541
<ol>
542542
<li>

‎css-font-loading/Overview.html‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -466,14 +466,14 @@ <h3 class="heading settled heading" data-level=2.3 id=font-face-css-connection><
466466
<h2 class="heading settled heading" data-level=3 id=FontFaceSet-interface><span class=secno>3 </span><span class=content>
467467
The <code>FontFaceSet</code> Interface</span><a class=self-link href=#FontFaceSet-interface></a></h2>
468468

469-
<pre class=idl>dictionary <dfn class=idl-code data-dfn-type=dictionary data-export="" data-global-name="" id=dictdef-cssfontfaceloadeventinit>CSSFontFaceLoadEventInit<a class=self-link href=#dictdef-cssfontfaceloadeventinit></a></dfn> : <a data-link-type=idl href=http://dom.spec.whatwg.org/#eventinit title=eventinit>EventInit</a> {
470-
sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <dfn class=idl-code data-dfn-for=CSSFontFaceLoadEventInit data-dfn-type=dict-member data-export="" data-global-name="CSSFontFaceLoadEventInit<dictionary>/fontfaces<dict-member>" id=dom-cssfontfaceloadeventinit-fontfaces>fontfaces<a class=self-link href=#dom-cssfontfaceloadeventinit-fontfaces></a></dfn> = [];
469+
<pre class=idl>dictionary <dfn class=idl-code data-dfn-type=dictionary data-export="" data-global-name="" id=dictdef-fontfacesetloadeventinit>FontFaceSetLoadEventInit<a class=self-link href=#dictdef-fontfacesetloadeventinit></a></dfn> : <a data-link-type=idl href=http://dom.spec.whatwg.org/#eventinit title=eventinit>EventInit</a> {
470+
sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <dfn class=idl-code data-dfn-for=FontFaceSetLoadEventInit data-dfn-type=dict-member data-export="" data-global-name="FontFaceSetLoadEventInit<dictionary>/fontfaces<dict-member>" id=dom-fontfacesetloadeventinit-fontfaces>fontfaces<a class=self-link href=#dom-fontfacesetloadeventinit-fontfaces></a></dfn> = [];
471471
};
472472

473-
[Constructor(DOMString <dfn class=idl-code data-dfn-for=CSSFontFaceLoadEvent/CSSFontFaceLoadEvent() data-dfn-type=argument data-export="" data-global-name="CSSFontFaceLoadEvent<interface>/CSSFontFaceLoadEvent()<method>/type<argument>" id=dom-cssfontfaceloadeventcssfontfaceloadevent-type>type<a class=self-link href=#dom-cssfontfaceloadeventcssfontfaceloadevent-type></a></dfn>, optional <a data-link-type=idl href=#dictdef-cssfontfaceloadeventinit title=cssfontfaceloadeventinit>CSSFontFaceLoadEventInit</a> <dfn class=idl-code data-dfn-for=CSSFontFaceLoadEvent/CSSFontFaceLoadEvent() data-dfn-type=argument data-export="" data-global-name="CSSFontFaceLoadEvent<interface>/CSSFontFaceLoadEvent()<method>/eventinitdict<argument>" id=dom-cssfontfaceloadeventcssfontfaceloadevent-eventinitdict>eventInitDict<a class=self-link href=#dom-cssfontfaceloadeventcssfontfaceloadevent-eventinitdict></a></dfn>),
473+
[Constructor(DOMString <dfn class=idl-code data-dfn-for=FontFaceSetLoadEvent/FontFaceSetLoadEvent() data-dfn-type=argument data-export="" data-global-name="FontFaceSetLoadEvent<interface>/FontFaceSetLoadEvent()<method>/type<argument>" id=dom-fontfacesetloadeventfontfacesetloadevent-type>type<a class=self-link href=#dom-fontfacesetloadeventfontfacesetloadevent-type></a></dfn>, optional <a data-link-type=idl href=#dictdef-fontfacesetloadeventinit title=fontfacesetloadeventinit>FontFaceSetLoadEventInit</a> <dfn class=idl-code data-dfn-for=FontFaceSetLoadEvent/FontFaceSetLoadEvent() data-dfn-type=argument data-export="" data-global-name="FontFaceSetLoadEvent<interface>/FontFaceSetLoadEvent()<method>/eventinitdict<argument>" id=dom-fontfacesetloadeventfontfacesetloadevent-eventinitdict>eventInitDict<a class=self-link href=#dom-fontfacesetloadeventfontfacesetloadevent-eventinitdict></a></dfn>),
474474
Exposed=Window,Worker]
475-
interface <dfn class=idl-code data-dfn-type=interface data-export="" data-global-name="" id=dom-cssfontfaceloadevent>CSSFontFaceLoadEvent<a class=self-link href=#dom-cssfontfaceloadevent></a></dfn> : <a data-link-type=idl href=http://dom.spec.whatwg.org/#event title=event>Event</a> {
476-
readonly attribute sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <dfn class=idl-code data-dfn-for=CSSFontFaceLoadEvent data-dfn-type=attribute data-export="" data-global-name="CSSFontFaceLoadEvent<interface>/fontfaces<attribute>" data-readonly="" data-type="sequence<FontFace> " id=dom-cssfontfaceloadevent-fontfaces>fontfaces<a class=self-link href=#dom-cssfontfaceloadevent-fontfaces></a></dfn>;
475+
interface <dfn class=idl-code data-dfn-type=interface data-export="" data-global-name="" id=dom-fontfacesetloadevent>FontFaceSetLoadEvent<a class=self-link href=#dom-fontfacesetloadevent></a></dfn> : <a data-link-type=idl href=http://dom.spec.whatwg.org/#event title=event>Event</a> {
476+
readonly attribute sequence&lt;<a data-link-type=idl href=#dom-fontface title=fontface>FontFace</a>&gt; <dfn class=idl-code data-dfn-for=FontFaceSetLoadEvent data-dfn-type=attribute data-export="" data-global-name="FontFaceSetLoadEvent<interface>/fontfaces<attribute>" data-readonly="" data-type="sequence<FontFace> " id=dom-fontfacesetloadevent-fontfaces>fontfaces<a class=self-link href=#dom-fontfacesetloadevent-fontfaces></a></dfn>;
477477
};
478478

479479
enum <dfn class=idl-code data-dfn-type=enum data-export="" data-global-name="" id=enumdef-fontfacesetloadstatus>FontFaceSetLoadStatus<a class=self-link href=#enumdef-fontfacesetloadstatus></a></dfn> { "loading", "loaded" };
@@ -641,11 +641,11 @@ <h3 class="heading settled heading" data-level=3.2 id=FontFaceSet-events><span c
641641
with optional <var>font faces</var>
642642
means to
643643
<a href=http://www.w3.org/TR/html5/webappapis.html#event-firing>fire a simple event</a> named <var>e</var>
644-
using the <a class=idl-code data-link-type=interface href=#dom-cssfontfaceloadevent title=cssfontfaceloadevent>CSSFontFaceLoadEvent</a> interface that also meets these conditions:</p>
644+
using the <a class=idl-code data-link-type=interface href=#dom-fontfacesetloadevent title=fontfacesetloadevent>FontFaceSetLoadEvent</a> interface that also meets these conditions:</p>
645645

646646
<ol>
647647
<li>
648-
The <a class=idl-code data-link-type=attribute href=#dom-cssfontfaceloadevent-fontfaces title=fontfaces>fontfaces</a> attribute is initialized to the given list of <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> objects.
648+
The <a class=idl-code data-link-type=attribute href=#dom-fontfacesetloadevent-fontfaces title=fontfaces>fontfaces</a> attribute is initialized to the given list of <a class=idl-code data-link-type=interface href=#dom-fontface title=fontface>FontFace</a> objects.
649649
</ol>
650650

651651
<p>Whenever one or more <a data-link-type=dfn href=#available-font-faces title="available font faces">available font faces</a> for a given <a class=idl-code data-link-type=interface href=#dom-fontfaceset title=fontfaceset>FontFaceSet</a>
@@ -1242,13 +1242,11 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
12421242
<li>clear(), <a href=#dom-fontfaceset-clear title="section 3">3</a>
12431243
<li>[[ContainedFonts]], <a href=#dom-fontfaceset-containedfonts title="section 3">3</a>
12441244
<li>CSS-connected, <a href=#css-connected title="section 2.3">2.3</a>
1245-
<li>CSSFontFaceLoadEvent, <a href=#dom-cssfontfaceloadevent title="section 3">3</a>
1246-
<li>CSSFontFaceLoadEventInit, <a href=#dictdef-cssfontfaceloadeventinit title="section 3">3</a>
12471245
<li>[[Data]], <a href=#dom-fontface-data title="section 2">2</a>
12481246
<li>delete(), <a href=#dom-fontfaceset-delete title="section 3">3</a>
12491247
<li>descriptors, <a href=#dom-fontfacefontface-descriptors title="section 2.1">2.1</a>
12501248
<li>entries(), <a href=#dom-fontfaceset-entries title="section 3">3</a>
1251-
<li>eventInitDict, <a href=#dom-cssfontfaceloadeventcssfontfaceloadevent-eventinitdict title="section 3">3</a>
1249+
<li>eventInitDict, <a href=#dom-fontfacesetloadeventfontfacesetloadevent-eventinitdict title="section 3">3</a>
12521250
<li>[[FailedFonts]], <a href=#dom-fontfaceset-failedfonts title="section 3">3</a>
12531251
<li>family<ul><li>attribute for FontFace, <a href=#dom-fontface-family title="section 2">2</a>
12541252
<li>argument for FontFace/FontFace(), <a href=#dom-fontfacefontface-family title="section 2.1">2.1</a>
@@ -1266,9 +1264,11 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
12661264
<li>FontFace(), <a href=#dom-fontface-fontface title="section 2.1">2.1</a>
12671265
<li>FontFaceDescriptors, <a href=#dictdef-fontfacedescriptors title="section 2">2</a>
12681266
<li>FontFaceLoadStatus, <a href=#enumdef-fontfaceloadstatus title="section 2">2</a>
1269-
<li>fontfaces<ul><li>dict-member for CSSFontFaceLoadEventInit, <a href=#dom-cssfontfaceloadeventinit-fontfaces title="section 3">3</a>
1270-
<li>attribute for CSSFontFaceLoadEvent, <a href=#dom-cssfontfaceloadevent-fontfaces title="section 3">3</a>
1267+
<li>fontfaces<ul><li>dict-member for FontFaceSetLoadEventInit, <a href=#dom-fontfacesetloadeventinit-fontfaces title="section 3">3</a>
1268+
<li>attribute for FontFaceSetLoadEvent, <a href=#dom-fontfacesetloadevent-fontfaces title="section 3">3</a>
12711269
</ul><li>FontFaceSet, <a href=#dom-fontfaceset title="section 3">3</a>
1270+
<li>FontFaceSetLoadEvent, <a href=#dom-fontfacesetloadevent title="section 3">3</a>
1271+
<li>FontFaceSetLoadEventInit, <a href=#dictdef-fontfacesetloadeventinit title="section 3">3</a>
12721272
<li>FontFaceSetLoadStatus, <a href=#enumdef-fontfacesetloadstatus title="section 3">3</a>
12731273
<li>FontFaceSource, <a href=#dom-fontfacesource title="section 4">4</a>
12741274
<li>fonts, <a href=#dom-fontfacesource-fonts title="section 4">4</a>
@@ -1307,7 +1307,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
13071307
</ul><li>text<ul><li>argument for FontFaceSet/load(), <a href=#dom-fontfacesetload-text title="section 3.3">3.3</a>
13081308
<li>argument for FontFaceSet/check(), <a href=#dom-fontfacesetcheck-text title="section 3.4">3.4</a>
13091309
</ul><li>thisArg, <a href=#dom-fontfacesetforeach-thisarg title="section 3">3</a>
1310-
<li>type, <a href=#dom-cssfontfaceloadeventcssfontfaceloadevent-type title="section 3">3</a>
1310+
<li>type, <a href=#dom-fontfacesetloadeventfontfacesetloadevent-type title="section 3">3</a>
13111311
<li>unicodeRange<ul><li>dict-member for FontFaceDescriptors, <a href=#dom-fontfacedescriptors-unicoderange title="section 2">2</a>
13121312
<li>attribute for FontFace, <a href=#dom-fontface-unicoderange title="section 2">2</a>
13131313
</ul><li>[[Urls]], <a href=#dom-fontface-urls title="section 2">2</a>

0 commit comments

Comments
 (0)