Skip to content

Commit 9f3b9e6

Browse files
SimonSapinSimonSapin
committed
[all] Replace all occurrences DOMString with CSSOMString.
CSSWG resolution: #1217 (comment) Fix #1217. Each occurrence is one of: * CSS syntax * A name (for example a property name) that also occurs in CSS syntax * `Stylesheet::type`, which is always `text/css`. * `Stylesheet::title`, which is set from the eponymous HTML content attribute of [`<style>`](https://html.spec.whatwg.org/multipage/semantics.html#attr-style-title) and [`<link>`](https://html.spec.whatwg.org/multipage/semantics.html#attr-link-title) elements.
1 parent 9e50910 commit 9f3b9e6

File tree

17 files changed

+177
-176
lines changed

17 files changed

+177
-176
lines changed

‎css-animations-2/Overview.bs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ the {{AnimationEvent}}.
540540
541541
<pre class="idl">
542542
interface CSSAnimation : Animation {
543-
readonly attribute DOMString animationName;
543+
readonly attribute CSSOMString animationName;
544544
};
545545
</pre>
546546
@@ -559,13 +559,13 @@ Perhaps something like the following:
559559
560560
<pre class="idl">
561561
[Constructor (Animatable? target,
562-
DOMString animationName,
562+
CSSOMString animationName,
563563
optional (unrestricted double or KeyframeEffectOptions) options,
564-
optional DOMString defaultEasing = "ease"),
564+
optional CSSOMString defaultEasing = "ease"),
565565
Constructor (Animatable? target,
566-
DOMString animationName,
566+
CSSOMString animationName,
567567
(unrestricted double or KeyframeEffectOptions) options,
568-
DOMString defaultEasing,
568+
CSSOMString defaultEasing,
569569
AnimationTimeline? timeline)]
570570
partial interface CSSAnimation { };
571571
</pre>
@@ -580,10 +580,10 @@ updating the set of keyframes returned by
580580
Something like,
581581
582582
<pre class="idl">
583-
[Constructor (DOMString keyframesName, DOMString defaultEasing)]
583+
[Constructor (CSSOMString keyframesName, CSSOMString defaultEasing)]
584584
interface CSSKeyframeEffectReadOnly : KeyframeEffectReadOnly {
585-
readonly attribute DOMString keyframesName;
586-
readonly attribute DOMString defaultEasing;
585+
readonly attribute CSSOMString keyframesName;
586+
readonly attribute CSSOMString defaultEasing;
587587
};
588588
</pre>
589589

‎css-animations/Overview.bs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -909,32 +909,32 @@ The <code>AnimationEvent</code> Interface</h3>
909909
IDL Definition</h4>
910910

911911
<pre class="idl">
912-
[Constructor(DOMString type, optional AnimationEventInit animationEventInitDict)]
912+
[Constructor(CSSOMString type, optional AnimationEventInit animationEventInitDict)]
913913
interface AnimationEvent : Event {
914-
readonly attribute DOMString animationName;
914+
readonly attribute CSSOMString animationName;
915915
readonly attribute float elapsedTime;
916-
readonly attribute DOMString pseudoElement;
916+
readonly attribute CSSOMString pseudoElement;
917917
};
918918
dictionary AnimationEventInit : EventInit {
919-
DOMString animationName = "";
919+
CSSOMString animationName = "";
920920
float elapsedTime = 0.0;
921-
DOMString pseudoElement = "";
921+
CSSOMString pseudoElement = "";
922922
};
923923
</pre>
924924

925925
<h4 id="interface-animationevent-attributes">
926926
Attributes</h4>
927927

928928
<dl dfn-type=attribute dfn-for=AnimationEvent>
929-
<dt><dfn>animationName</dfn>, of type <a interface>DOMString</a>, readonly
929+
<dt><dfn>animationName</dfn>, of type <a interface>CSSOMString</a>, readonly
930930
<dd>
931931
The value of the 'animation-name' property of the animation that fired the event.
932932
<dt><dfn>elapsedTime</dfn>, of type float, readonly
933933
<dd>
934934
The amount of time the animation has been running, in seconds, when this event fired,
935935
excluding any time the animation was paused. The precise calculation for
936936
of this member is defined along with each event type.
937-
<dt><dfn>pseudoElement</dfn>, of type <a interface>DOMString</a>, readonly
937+
<dt><dfn>pseudoElement</dfn>, of type <a interface>CSSOMString</a>, readonly
938938
<dd>
939939
The name (beginning with two colons) of the CSS pseudo-element on which the animation
940940
runs (in which case the target of the event is that pseudo-element's corresponding
@@ -1091,7 +1091,7 @@ IDL Definition</h4>
10911091

10921092
<pre class="idl">
10931093
interface CSSKeyframeRule : CSSRule {
1094-
attribute DOMString keyText;
1094+
attribute CSSOMString keyText;
10951095
[SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
10961096
};
10971097
</pre>
@@ -1143,12 +1143,12 @@ IDL Definition</h4>
11431143

11441144
<pre class="idl">
11451145
interface CSSKeyframesRule : CSSRule {
1146-
attribute DOMString name;
1146+
attribute CSSOMString name;
11471147
readonly attribute CSSRuleList cssRules;
11481148

1149-
void appendRule(DOMString rule);
1150-
void deleteRule(DOMString select);
1151-
CSSKeyframeRule? findRule(DOMString select);
1149+
void appendRule(CSSOMString rule);
1150+
void deleteRule(CSSOMString select);
1151+
CSSKeyframeRule? findRule(CSSOMString select);
11521152
};
11531153
</pre>
11541154

@@ -1181,7 +1181,7 @@ The <code>appendRule</code> method</h4>
11811181

11821182
<dl>
11831183

1184-
<dt><dfn argument for="CSSKeyframesRule/appendRule(rule)">rule</dfn> of type <a interface>DOMString</a>
1184+
<dt><dfn argument for="CSSKeyframesRule/appendRule(rule)">rule</dfn> of type <a interface>CSSOMString</a>
11851185
<dd>
11861186
The rule to be appended, expressed in the same syntax as one entry in the
11871187
''@keyframes'' rule. A valid rule is always appended e.g. even if its key(s) already
@@ -1203,7 +1203,7 @@ The <code>deleteRule</code> method</h4>
12031203

12041204
<dl>
12051205

1206-
<dt><dfn argument for="CSSKeyframesRule/deleteRule(select)">select</dfn> of type <a interface>DOMString</a>
1206+
<dt><dfn argument for="CSSKeyframesRule/deleteRule(select)">select</dfn> of type <a interface>CSSOMString</a>
12071207
<dd>
12081208
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords ''from'' or ''to'' which resolve to 0% and 100%, respectively.
12091209

@@ -1225,7 +1225,7 @@ The <code>findRule</code> method</h4>
12251225
Parameters:
12261226

12271227
<dl>
1228-
<dt><dfn argument for="CSSKeyframesRule/findRule(select)">select</dfn> of type <a interface>DOMString</a>
1228+
<dt><dfn argument for="CSSKeyframesRule/findRule(select)">select</dfn> of type <a interface>CSSOMString</a>
12291229
<dd>
12301230
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords ''from'' or ''to'' which resolve to 0% and 100%, respectively.
12311231

‎css-conditional/Overview.bs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ The <code>CSSGroupingRule</code> interface</h3>
834834
<pre class='idl'>
835835
interface CSSGroupingRule : CSSRule {
836836
readonly attribute <a href="https://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSRuleList">CSSRuleList</a> cssRules;
837-
unsigned long insertRule (DOMString rule, unsigned long index);
837+
unsigned long insertRule (CSSOMString rule, unsigned long index);
838838
void deleteRule (unsigned long index);
839839
};
840840
</pre>
@@ -846,7 +846,7 @@ interface CSSGroupingRule : CSSRule {
846846
</dl>
847847

848848
<dl class='idl-methods'>
849-
<dt><code>insertRule(DOMString rule, unsigned long index)</code>, returns
849+
<dt><code>insertRule(CSSOMString rule, unsigned long index)</code>, returns
850850
<code>unsigned long</code>
851851
<dd>
852852
The <code>insertRule</code> operation must
@@ -890,13 +890,13 @@ all the &ldquo;conditional&rdquo; at-rules,
890890

891891
<pre class='idl' export>
892892
interface CSSConditionRule : CSSGroupingRule {
893-
attribute DOMString conditionText;
893+
attribute CSSOMString conditionText;
894894
};
895895
</pre>
896896

897897
<dl class='idl-attributes'>
898898

899-
<dt><code>conditionText</code> of type <code>DOMString</code>
899+
<dt><code>conditionText</code> of type <code>CSSOMString</code>
900900
<dd>
901901
<p>The <code>conditionText</code> attribute represents
902902
the condition of the rule.
@@ -940,7 +940,7 @@ interface CSSMediaRule : CSSConditionRule {
940940
<dd>The <code>media</code> attribute must return a <code>MediaList</code> object
941941
for the list of media queries specified with the ''@media'' rule.
942942

943-
<dt><code>conditionText</code> of type <code>DOMString</code> (CSSMediaRule-specific definition for attribute on CSSConditionRule)
943+
<dt><code>conditionText</code> of type <code>CSSOMString</code> (CSSMediaRule-specific definition for attribute on CSSConditionRule)
944944
<dd>The <code>conditionText</code> attribute (defined on the <code>CSSConditionRule</code> parent rule),
945945
on getting, must return the value of <code>media.mediaText</code> on the rule.
946946

@@ -960,7 +960,7 @@ interface CSSSupportsRule : CSSConditionRule {
960960
</pre>
961961

962962
<dl class='idl-attributes'>
963-
<dt><code>conditionText</code> of type <code>DOMString</code> (CSSSupportsRule-specific definition for attribute on CSSConditionRule)
963+
<dt><code>conditionText</code> of type <code>CSSOMString</code> (CSSSupportsRule-specific definition for attribute on CSSConditionRule)
964964
<dd>The <code>conditionText</code> attribute (defined on the <code>CSSConditionRule</code> parent rule),
965965
on getting, must return the condition that was specified,
966966
without any logical simplifications,
@@ -998,15 +998,15 @@ The {{CSS}} interface holds useful CSS-related functions that do not belong else
998998

999999
<pre class='idl'>
10001000
partial interface CSS {
1001-
static boolean supports(DOMString property, DOMString value);
1002-
static boolean supports(DOMString conditionText);
1001+
static boolean supports(CSSOMString property, CSSOMString value);
1002+
static boolean supports(CSSOMString conditionText);
10031003
};
10041004
</pre>
10051005

10061006
<dl class='idl-methods'>
1007-
<dt><code>supports(DOMString property, DOMString value)</code>,
1007+
<dt><code>supports(CSSOMString property, CSSOMString value)</code>,
10081008
returns <code>boolean</code>
1009-
<dt><code>supports(DOMString conditionText)</code>,
1009+
<dt><code>supports(CSSOMString conditionText)</code>,
10101010
returns <code>boolean</code>
10111011
<dd>
10121012
When the <code title=''>supports()</code> method is invoked with two arguments <var>property</var> and <var>value</var>,

‎css-counter-styles/Overview.bs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,24 +2480,24 @@ The <code>CSSCounterStyleRule</code> interface</h3>
24802480

24812481
<pre class='idl'>
24822482
interface CSSCounterStyleRule : CSSRule {
2483-
attribute DOMString name;
2484-
attribute DOMString system;
2485-
attribute DOMString symbols;
2486-
attribute DOMString additiveSymbols;
2487-
attribute DOMString negative;
2488-
attribute DOMString prefix;
2489-
attribute DOMString suffix;
2490-
attribute DOMString range;
2491-
attribute DOMString pad;
2492-
attribute DOMString speakAs;
2493-
attribute DOMString fallback;
2483+
attribute CSSOMString name;
2484+
attribute CSSOMString system;
2485+
attribute CSSOMString symbols;
2486+
attribute CSSOMString additiveSymbols;
2487+
attribute CSSOMString negative;
2488+
attribute CSSOMString prefix;
2489+
attribute CSSOMString suffix;
2490+
attribute CSSOMString range;
2491+
attribute CSSOMString pad;
2492+
attribute CSSOMString speakAs;
2493+
attribute CSSOMString fallback;
24942494
};
24952495
</pre>
24962496

24972497
<dl class='idl-attributes' >
2498-
<dt><a attribute>name</a> of type <code>DOMString</code>
2498+
<dt><a attribute>name</a> of type <code>CSSOMString</code>
24992499
<dd>
2500-
The <var>name</var> attribute on getting must return a <code>DOMString</code> object
2500+
The <var>name</var> attribute on getting must return a <code>CSSOMString</code> object
25012501
that contains the serialization of the <<counter-style-name>> defined for the associated rule.
25022502

25032503
On setting the <var>name</var> attribute, run the following steps:
@@ -2517,18 +2517,18 @@ The <code>CSSCounterStyleRule</code> interface</h3>
25172517
<li>Otherwise, do nothing.
25182518
</ol>
25192519

2520-
<dt><a attribute>system</a> of type <code>DOMString</code>
2521-
<dt><a attribute>symbols</a> of type <code>DOMString</code>
2522-
<dt><a attribute>additiveSymbols</a> of type <code>DOMString</code>
2523-
<dt><a attribute>negative</a> of type <code>DOMString</code>
2524-
<dt><a attribute attribute>prefix</a> of type <code>DOMString</code>
2525-
<dt><a attribute>suffix</a> of type <code>DOMString</code>
2526-
<dt><a attribute>range</a> of type <code>DOMString</code>
2527-
<dt><a attribute>pad</a> of type <code>DOMString</code>
2528-
<dt><a attribute>speakAs</a> of type <code>DOMString</code>
2529-
<dt><a attribute>fallback</a> of type <code>DOMString</code>
2520+
<dt><a attribute>system</a> of type <code>CSSOMString</code>
2521+
<dt><a attribute>symbols</a> of type <code>CSSOMString</code>
2522+
<dt><a attribute>additiveSymbols</a> of type <code>CSSOMString</code>
2523+
<dt><a attribute>negative</a> of type <code>CSSOMString</code>
2524+
<dt><a attribute attribute>prefix</a> of type <code>CSSOMString</code>
2525+
<dt><a attribute>suffix</a> of type <code>CSSOMString</code>
2526+
<dt><a attribute>range</a> of type <code>CSSOMString</code>
2527+
<dt><a attribute>pad</a> of type <code>CSSOMString</code>
2528+
<dt><a attribute>speakAs</a> of type <code>CSSOMString</code>
2529+
<dt><a attribute>fallback</a> of type <code>CSSOMString</code>
25302530
<dd>
2531-
The remaining attributes on getting must return a <code>DOMString</code> object
2531+
The remaining attributes on getting must return a <code>CSSOMString</code> object
25322532
that contains the serialization of the associated descriptor defined for the associated rule.
25332533
If the descriptor was not specified in the associated rule,
25342534
the attribute must return an empty string.

‎css-font-loading/Overview.bs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,27 @@ The <code>FontFace</code> Interface</h2>
8181
typedef (ArrayBuffer or ArrayBufferView) BinaryData;
8282

8383
dictionary FontFaceDescriptors {
84-
DOMString style = "normal";
85-
DOMString weight = "normal";
86-
DOMString stretch = "normal";
87-
DOMString unicodeRange = "U+0-10FFFF";
88-
DOMString variant = "normal";
89-
DOMString featureSettings = "normal";
84+
CSSOMString style = "normal";
85+
CSSOMString weight = "normal";
86+
CSSOMString stretch = "normal";
87+
CSSOMString unicodeRange = "U+0-10FFFF";
88+
CSSOMString variant = "normal";
89+
CSSOMString featureSettings = "normal";
9090
};
9191

9292
enum FontFaceLoadStatus { "unloaded", "loading", "loaded", "error" };
9393

94-
[Constructor(DOMString family, (DOMString or BinaryData) source,
94+
[Constructor(CSSOMString family, (CSSOMString or BinaryData) source,
9595
optional FontFaceDescriptors descriptors),
9696
Exposed=Window,Worker]
9797
interface FontFace {
98-
attribute DOMString family;
99-
attribute DOMString style;
100-
attribute DOMString weight;
101-
attribute DOMString stretch;
102-
attribute DOMString unicodeRange;
103-
attribute DOMString variant;
104-
attribute DOMString featureSettings;
98+
attribute CSSOMString family;
99+
attribute CSSOMString style;
100+
attribute CSSOMString weight;
101+
attribute CSSOMString stretch;
102+
attribute CSSOMString unicodeRange;
103+
attribute CSSOMString variant;
104+
attribute CSSOMString featureSettings;
105105

106106
readonly attribute FontFaceLoadStatus status;
107107

@@ -206,8 +206,8 @@ The Constructor</h3>
206206

207207
When the <dfn constructor lt='FontFace()' for=FontFace>FontFace</dfn>(
208208
<span dfn-for="FontFace/FontFace(family, source, descriptors)">
209-
DOMString <dfn argument>family</dfn>,
210-
(DOMString or {{/BinaryData}}) <dfn argument>source</dfn>,
209+
CSSOMString <dfn argument>family</dfn>,
210+
(CSSOMString or {{/BinaryData}}) <dfn argument>source</dfn>,
211211
{{/FontFaceDescriptors}} <dfn argument>descriptors</dfn>
212212
</span>
213213
)
@@ -221,7 +221,7 @@ The Constructor</h3>
221221
Parse the {{family!!argument}} argument,
222222
and the members of the {{descriptors!!argument}} argument,
223223
according to the grammars of the corresponding descriptors of the CSS ''@font-face'' rule.
224-
If the {{source!!argument}} argument is a {{DOMString}},
224+
If the {{source!!argument}} argument is a {{CSSOMString}},
225225
parse it according to the grammar of the CSS ''@font-face/src'' descriptor of the ''@font-face'' rule.
226226
If any of them fail to parse correctly,
227227
reject <var>font face's</var> {{[[FontStatusPromise]]}} with a DOMException named "SyntaxError",
@@ -251,7 +251,7 @@ The Constructor</h3>
251251
otherwise,
252252
complete the rest of these steps asynchronously.
253253

254-
2. If the {{source!!argument}} argument was a {{DOMString}},
254+
2. If the {{source!!argument}} argument was a {{CSSOMString}},
255255
set <var>font face's</var> internal {{[[Urls]]}} slot to the string.
256256

257257
If the {{source}} argument was a {{BinaryData}},
@@ -443,7 +443,7 @@ The <code>FontFaceSet</code> Interface</h2>
443443
sequence&lt;FontFace> fontfaces = [];
444444
};
445445

446-
[Constructor(DOMString type, optional FontFaceSetLoadEventInit eventInitDict),
446+
[Constructor(CSSOMString type, optional FontFaceSetLoadEventInit eventInitDict),
447447
Exposed=Window,Worker]
448448
interface FontFaceSetLoadEvent : Event {
449449
[SameObject] readonly attribute FrozenArray&lt;FontFace> fontfaces;
@@ -469,11 +469,11 @@ The <code>FontFaceSet</code> Interface</h2>
469469

470470
// check and start loads if appropriate
471471
// and fulfill promise when all loads complete
472-
Promise&lt;sequence&lt;FontFace>> load(DOMString font, optional DOMString text = " ");
472+
Promise&lt;sequence&lt;FontFace>> load(CSSOMString font, optional CSSOMString text = " ");
473473

474474
// return whether all fonts in the fontlist are loaded
475475
// (does not initiate load if not available)
476-
boolean check(DOMString font, optional DOMString text = " ");
476+
boolean check(CSSOMString font, optional CSSOMString text = " ");
477477

478478
// async notification that font loading and layout operations are done
479479
readonly attribute Promise&lt;FontFaceSet> ready;

0 commit comments

Comments
 (0)