Skip to content

Commit a7f59e9

Browse files
committed
[web-animations-1] Consistently refer to keyframe-specific composite operations as having a null value
This closes w3c#2289.
1 parent 56c7003 commit a7f59e9

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

web-animations-1/Overview.bs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3245,14 +3245,14 @@ is specified and the <em>next</em> keyframe in the list.
32453245
The <a>timing function</a> specified on the last keyframe in the
32463246
list is never applied.
32473247

3248-
Each <a>keyframe</a> may also have a <dfn>keyframe-specific composite
3249-
operation</dfn> that is applied to all values
3248+
Each <a>keyframe</a> may has a <dfn>keyframe-specific composite
3249+
operation</dfn> that, if not null, is applied to all values
32503250
specified in that <a>keyframe</a>.
32513251
The possible operations and their meanings are identical to those defined
32523252
for the <a>composite operation</a> associated with the <a>keyframe effect</a>
32533253
as a whole in [[#effect-composition]].
3254-
If no <a>keyframe-specific composite operation</a> is specified for
3255-
a <a>keyframe</a>, the <a>composite operation</a> specified for the
3254+
If the <a>keyframe-specific composite operation</a> for a <a>keyframe</a>
3255+
is null, the <a>composite operation</a> specified for the
32563256
<a>keyframe effect</a> as a whole is used for values specified in that keyframe.
32573257

32583258
<h4 id="calculating-computed-keyframes">Calculating computed keyframes</h4>
@@ -4864,16 +4864,16 @@ interface KeyframeEffect : KeyframeEffectReadOnly {
48644864
};
48654865
</pre>
48664866
4867-
1. Set {{BaseComputedKeyframe/offset}},
4867+
1. Set the {{BaseComputedKeyframe/offset}},
48684868
{{BaseComputedKeyframe/computedOffset}},
4869-
{{BaseComputedKeyframe/easing}} members of
4870-
<var>output keyframe</var> to the respective values
4869+
{{BaseComputedKeyframe/easing}}, and
4870+
{{BaseComputedKeyframe/composite}} members of
4871+
<var>output keyframe</var> to the respective
48714872
<a>keyframe offset</a>,
4872-
<a>computed keyframe offset</a>, and
4873-
keyframe-specific <a>timing function</a>
4874-
of <var>keyframe</var>.
4875-
1. If <var>keyframe</var> has a <a>keyframe-specific composite
4876-
operation</a>, set {{BaseComputedKeyframe/composite}} to that value.
4873+
<a>computed keyframe offset</a>,
4874+
keyframe-specific <a>timing function</a>, and
4875+
<a>keyframe-specific composite operation</a>
4876+
values of <var>keyframe</var>.
48774877
1. For each animation property-value pair specified on
48784878
<var>keyframe</var>, <var>declaration</var>, perform the following
48794879
steps:
@@ -5576,8 +5576,8 @@ dictionary KeyframeEffectOptions : AnimationEffectTimingProperties {
55765576
:: The <a>composite operation</a> used to composite this
55775577
animation with the <a>effect stack</a>, as specified by one
55785578
of the <a>CompositeOperation</a> enumeration values.
5579-
This is used for all <a>keyframes</a> that do not specify
5580-
a <a>keyframe-specific composite operation</a>.
5579+
This is used for all <a>keyframes</a> that specify
5580+
a null <a>keyframe-specific composite operation</a>.
55815581
55825582
</div>
55835583

0 commit comments

Comments
 (0)