Skip to content

[cssom][all] Add CSSOMString and replace DOMString usage with it #1266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 21, 2017
Merged

[cssom][all] Add CSSOMString and replace DOMString usage with it #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3228c6b
[cssom] Fix some Bikeshed warnings
SimonSapin Apr 19, 2017
de105a8
[cssom] Use USVString for href attribute of Stylesheet and CSSImportRule
SimonSapin Apr 21, 2017
f23d119
[cssom] Add IDL `CSSOMString`, typedef of either USVString or DOMString
SimonSapin Apr 21, 2017
9e50910
[css-color] Remove unused DOMString term from "Ignored Terms".
SimonSapin Apr 21, 2017
b937a92
[all] Replace most occurrences DOMString with CSSOMString.
SimonSapin Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions css-animations-2/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ the {{AnimationEvent}}.

<pre class="idl">
interface CSSAnimation : Animation {
readonly attribute DOMString animationName;
readonly attribute CSSOMString animationName;
};
</pre>

Expand All @@ -559,13 +559,13 @@ Perhaps something like the following:

<pre class="idl">
[Constructor (Animatable? target,
DOMString animationName,
CSSOMString animationName,
optional (unrestricted double or KeyframeEffectOptions) options,
optional DOMString defaultEasing = "ease"),
optional CSSOMString defaultEasing = "ease"),
Constructor (Animatable? target,
DOMString animationName,
CSSOMString animationName,
(unrestricted double or KeyframeEffectOptions) options,
DOMString defaultEasing,
CSSOMString defaultEasing,
AnimationTimeline? timeline)]
partial interface CSSAnimation { };
</pre>
Expand All @@ -580,10 +580,10 @@ updating the set of keyframes returned by
Something like,

<pre class="idl">
[Constructor (DOMString keyframesName, DOMString defaultEasing)]
[Constructor (CSSOMString keyframesName, CSSOMString defaultEasing)]
interface CSSKeyframeEffectReadOnly : KeyframeEffectReadOnly {
readonly attribute DOMString keyframesName;
readonly attribute DOMString defaultEasing;
readonly attribute CSSOMString keyframesName;
readonly attribute CSSOMString defaultEasing;
};
</pre>

Expand Down
30 changes: 15 additions & 15 deletions css-animations/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,32 +909,32 @@ The <code>AnimationEvent</code> Interface</h3>
IDL Definition</h4>

<pre class="idl">
[Constructor(DOMString type, optional AnimationEventInit animationEventInitDict)]
[Constructor(CSSOMString type, optional AnimationEventInit animationEventInitDict)]
interface AnimationEvent : Event {
readonly attribute DOMString animationName;
readonly attribute CSSOMString animationName;
readonly attribute float elapsedTime;
readonly attribute DOMString pseudoElement;
readonly attribute CSSOMString pseudoElement;
};
dictionary AnimationEventInit : EventInit {
DOMString animationName = "";
CSSOMString animationName = "";
float elapsedTime = 0.0;
DOMString pseudoElement = "";
CSSOMString pseudoElement = "";
};
</pre>

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

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

<pre class="idl">
interface CSSKeyframeRule : CSSRule {
attribute DOMString keyText;
attribute CSSOMString keyText;
[SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
};
</pre>
Expand Down Expand Up @@ -1143,12 +1143,12 @@ IDL Definition</h4>

<pre class="idl">
interface CSSKeyframesRule : CSSRule {
attribute DOMString name;
attribute CSSOMString name;
readonly attribute CSSRuleList cssRules;

void appendRule(DOMString rule);
void deleteRule(DOMString select);
CSSKeyframeRule? findRule(DOMString select);
void appendRule(CSSOMString rule);
void deleteRule(CSSOMString select);
CSSKeyframeRule? findRule(CSSOMString select);
};
</pre>

Expand Down Expand Up @@ -1181,7 +1181,7 @@ The <code>appendRule</code> method</h4>

<dl>

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

<dl>

<dt><dfn argument for="CSSKeyframesRule/deleteRule(select)">select</dfn> of type <a interface>DOMString</a>
<dt><dfn argument for="CSSKeyframesRule/deleteRule(select)">select</dfn> of type <a interface>CSSOMString</a>
<dd>
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.

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

<dl>
<dt><dfn argument for="CSSKeyframesRule/findRule(select)">select</dfn> of type <a interface>DOMString</a>
<dt><dfn argument for="CSSKeyframesRule/findRule(select)">select</dfn> of type <a interface>CSSOMString</a>
<dd>
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.

Expand Down
2 changes: 1 addition & 1 deletion css-color/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Former Editor: L. David Baron, Mozilla Corporation, dbaron@dbaron.org
Abstract: This specification describes CSS <<color>> values and properties for foreground color and group opacity.
Repository: w3c/csswg-drafts
Inline Github Issues: title
Ignored Terms: stacking context, double, octet, DOMString
Ignored Terms: stacking context, double, octet
</pre>

<style>
Expand Down
20 changes: 10 additions & 10 deletions css-conditional/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ The <code>CSSGroupingRule</code> interface</h3>
<pre class='idl'>
interface CSSGroupingRule : CSSRule {
readonly attribute <a href="https://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSRuleList">CSSRuleList</a> cssRules;
unsigned long insertRule (DOMString rule, unsigned long index);
unsigned long insertRule (CSSOMString rule, unsigned long index);
void deleteRule (unsigned long index);
};
</pre>
Expand All @@ -846,7 +846,7 @@ interface CSSGroupingRule : CSSRule {
</dl>

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

<pre class='idl' export>
interface CSSConditionRule : CSSGroupingRule {
attribute DOMString conditionText;
attribute CSSOMString conditionText;
};
</pre>

<dl class='idl-attributes'>

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

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

Expand All @@ -960,7 +960,7 @@ interface CSSSupportsRule : CSSConditionRule {
</pre>

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

<pre class='idl'>
partial interface CSS {
static boolean supports(DOMString property, DOMString value);
static boolean supports(DOMString conditionText);
static boolean supports(CSSOMString property, CSSOMString value);
static boolean supports(CSSOMString conditionText);
};
</pre>

<dl class='idl-methods'>
<dt><code>supports(DOMString property, DOMString value)</code>,
<dt><code>supports(CSSOMString property, CSSOMString value)</code>,
returns <code>boolean</code>
<dt><code>supports(DOMString conditionText)</code>,
<dt><code>supports(CSSOMString conditionText)</code>,
returns <code>boolean</code>
<dd>
When the <code title=''>supports()</code> method is invoked with two arguments <var>property</var> and <var>value</var>,
Expand Down
48 changes: 24 additions & 24 deletions css-counter-styles/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2480,24 +2480,24 @@ The <code>CSSCounterStyleRule</code> interface</h3>

<pre class='idl'>
interface CSSCounterStyleRule : CSSRule {
attribute DOMString name;
attribute DOMString system;
attribute DOMString symbols;
attribute DOMString additiveSymbols;
attribute DOMString negative;
attribute DOMString prefix;
attribute DOMString suffix;
attribute DOMString range;
attribute DOMString pad;
attribute DOMString speakAs;
attribute DOMString fallback;
attribute CSSOMString name;
attribute CSSOMString system;
attribute CSSOMString symbols;
attribute CSSOMString additiveSymbols;
attribute CSSOMString negative;
attribute CSSOMString prefix;
attribute CSSOMString suffix;
attribute CSSOMString range;
attribute CSSOMString pad;
attribute CSSOMString speakAs;
attribute CSSOMString fallback;
};
</pre>

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

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

<dt><a attribute>system</a> of type <code>DOMString</code>
<dt><a attribute>symbols</a> of type <code>DOMString</code>
<dt><a attribute>additiveSymbols</a> of type <code>DOMString</code>
<dt><a attribute>negative</a> of type <code>DOMString</code>
<dt><a attribute attribute>prefix</a> of type <code>DOMString</code>
<dt><a attribute>suffix</a> of type <code>DOMString</code>
<dt><a attribute>range</a> of type <code>DOMString</code>
<dt><a attribute>pad</a> of type <code>DOMString</code>
<dt><a attribute>speakAs</a> of type <code>DOMString</code>
<dt><a attribute>fallback</a> of type <code>DOMString</code>
<dt><a attribute>system</a> of type <code>CSSOMString</code>
<dt><a attribute>symbols</a> of type <code>CSSOMString</code>
<dt><a attribute>additiveSymbols</a> of type <code>CSSOMString</code>
<dt><a attribute>negative</a> of type <code>CSSOMString</code>
<dt><a attribute attribute>prefix</a> of type <code>CSSOMString</code>
<dt><a attribute>suffix</a> of type <code>CSSOMString</code>
<dt><a attribute>range</a> of type <code>CSSOMString</code>
<dt><a attribute>pad</a> of type <code>CSSOMString</code>
<dt><a attribute>speakAs</a> of type <code>CSSOMString</code>
<dt><a attribute>fallback</a> of type <code>CSSOMString</code>
<dd>
The remaining attributes on getting must return a <code>DOMString</code> object
The remaining attributes on getting must return a <code>CSSOMString</code> object
that contains the serialization of the associated descriptor defined for the associated rule.
If the descriptor was not specified in the associated rule,
the attribute must return an empty string.
Expand Down
42 changes: 21 additions & 21 deletions css-font-loading/Overview.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,27 +81,27 @@ The <code>FontFace</code> Interface</h2>
typedef (ArrayBuffer or ArrayBufferView) BinaryData;

dictionary FontFaceDescriptors {
DOMString style = "normal";
DOMString weight = "normal";
DOMString stretch = "normal";
DOMString unicodeRange = "U+0-10FFFF";
DOMString variant = "normal";
DOMString featureSettings = "normal";
CSSOMString style = "normal";
CSSOMString weight = "normal";
CSSOMString stretch = "normal";
CSSOMString unicodeRange = "U+0-10FFFF";
CSSOMString variant = "normal";
CSSOMString featureSettings = "normal";
};

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

[Constructor(DOMString family, (DOMString or BinaryData) source,
[Constructor(CSSOMString family, (CSSOMString or BinaryData) source,
optional FontFaceDescriptors descriptors),
Exposed=Window,Worker]
interface FontFace {
attribute DOMString family;
attribute DOMString style;
attribute DOMString weight;
attribute DOMString stretch;
attribute DOMString unicodeRange;
attribute DOMString variant;
attribute DOMString featureSettings;
attribute CSSOMString family;
attribute CSSOMString style;
attribute CSSOMString weight;
attribute CSSOMString stretch;
attribute CSSOMString unicodeRange;
attribute CSSOMString variant;
attribute CSSOMString featureSettings;

readonly attribute FontFaceLoadStatus status;

Expand Down Expand Up @@ -206,8 +206,8 @@ The Constructor</h3>

When the <dfn constructor lt='FontFace()' for=FontFace>FontFace</dfn>(
<span dfn-for="FontFace/FontFace(family, source, descriptors)">
DOMString <dfn argument>family</dfn>,
(DOMString or {{/BinaryData}}) <dfn argument>source</dfn>,
CSSOMString <dfn argument>family</dfn>,
(CSSOMString or {{/BinaryData}}) <dfn argument>source</dfn>,
{{/FontFaceDescriptors}} <dfn argument>descriptors</dfn>
</span>
)
Expand All @@ -221,7 +221,7 @@ The Constructor</h3>
Parse the {{family!!argument}} argument,
and the members of the {{descriptors!!argument}} argument,
according to the grammars of the corresponding descriptors of the CSS ''@font-face'' rule.
If the {{source!!argument}} argument is a {{DOMString}},
If the {{source!!argument}} argument is a {{CSSOMString}},
parse it according to the grammar of the CSS ''@font-face/src'' descriptor of the ''@font-face'' rule.
If any of them fail to parse correctly,
reject <var>font face's</var> {{[[FontStatusPromise]]}} with a DOMException named "SyntaxError",
Expand Down Expand Up @@ -251,7 +251,7 @@ The Constructor</h3>
otherwise,
complete the rest of these steps asynchronously.

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

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

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

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

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

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