Skip to content

Commit 1a2c62a

Browse files
birtlessvgeesus
authored andcommitted
Rename 'composition operation' to 'composite operation'
This matches the enum name and the naming for iteration composite operation.
1 parent b5fd0ea commit 1a2c62a

1 file changed

Lines changed: 39 additions & 39 deletions

File tree

web-animations/index.html

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3761,7 +3761,7 @@ <h2>Combining animations</h2>
37613761
</p>
37623762
<p>
37633763
The matter of <em>how</em> <a>intermediate animation values</a> are
3764-
combined is governed by the <a>composition operation</a> of
3764+
combined is governed by the <a>composite operation</a> of
37653765
the corresponding <a>animation effects</a>.
37663766
</p>
37673767
<p>
@@ -3878,21 +3878,21 @@ <h3>Animation composition</h3>
38783878
<p>
38793879
The specific operation used to combine an <a>intermediate animation
38803880
value</a> with an <a>underlying value</a> is determined by the
3881-
<dfn>composition operation</dfn> of the <a>animation effect</a> that
3881+
<dfn>composite operation</dfn> of the <a>animation effect</a> that
38823882
produced the <a>intermediate animation value</a>.
38833883
</p>
38843884
<p>
3885-
This specification defines three <a>composition operations</a> as
3885+
This specification defines three <a>composite operations</a> as
38863886
follows:
38873887
</p>
38883888
<dl>
3889-
<dt><dfn title="composition operation replace">replace</dfn></dt>
3889+
<dt><dfn title="composite operation replace">replace</dfn></dt>
38903890
<dd>
38913891
The result of compositing the <a>intermediate animation value</a>
38923892
with the <a>underlying value</a> is simply the <a>intermediate
38933893
animation value</a>.
38943894
</dd>
3895-
<dt><dfn title="composition operation add">add</dfn></dt>
3895+
<dt><dfn title="composite operation add">add</dfn></dt>
38963896
<dd>
38973897
<p>
38983898
The <a>intermediate animation value</a> is <a
@@ -3906,7 +3906,7 @@ <h3>Animation composition</h3>
39063906
</p>
39073907
</dd>
39083908
<dt><dfn
3909-
title="composition operation accumulate">accumulate</dfn></dt>
3909+
title="composite operation accumulate">accumulate</dfn></dt>
39103910
<dd>
39113911
<p>
39123912
The <a>intermediate animation value</a> is <a
@@ -4078,12 +4078,12 @@ <h2>Keyframe animation effects</h2>
40784078
list is never applied.
40794079
</p>
40804080
<p>
4081-
In addition to the <a>composition operation</a> specified on the
4081+
In addition to the <a>composite operation</a> specified on the
40824082
<a>animation effect</a>, each <a>keyframe</a> may also have an
4083-
associated <a>composition operation</a> that is applied to all values
4083+
associated <a>composite operation</a> that is applied to all values
40844084
specified in that <a>keyframe</a>.
4085-
If no <a>composition operation</a> is specified for a <a>keyframe</a>,
4086-
the <a>composition operation</a> specified for the <a>animation
4085+
If no <a>composite operation</a> is specified for a <a>keyframe</a>,
4086+
the <a>composite operation</a> specified for the <a>animation
40874087
effect</a> is used.
40884088
</p>
40894089
<section>
@@ -4416,7 +4416,7 @@ <h3>The intermediate animation value of a keyframe animation effect</h3>
44164416
be applied.
44174417
<li>Define the <dfn>neutral value for composition</dfn> as a value
44184418
which, when combined with an <a>underlying value</a> using the <a
4419-
title="composition operation add">add</a> <a>composition
4419+
title="composite operation add">add</a> <a>composite
44204420
operation</a>, produces the <a>underlying value</a>.
44214421
<li>Let <var>property-specific keyframes</var> be a copy of the list
44224422
of <a>keyframes</a> specified on the effect.
@@ -4429,16 +4429,16 @@ <h3>The intermediate animation value of a keyframe animation effect</h3>
44294429
keyframes</var> with a <a>keyframe offset</a> of
44304430
0, create a new <a>keyframe</a> with a <a>keyframe offset</a> of
44314431
0, a property value set to the <a>neutral value for
4432-
composition</a>, and a <a>composition operation</a> of <a
4433-
title="composition operation add">add</a>, and prepend it to the
4432+
composition</a>, and a <a>composite operation</a> of <a
4433+
title="composite operation add">add</a>, and prepend it to the
44344434
beginning of <var>property-specific keyframes</var>.
44354435
<li>Similarly, if there is no <a>keyframe</a> in
44364436
<var>property-specific keyframes</var> with a <a>keyframe
44374437
offset</a> of 1,
44384438
create a new <a>keyframe</a> with a <a>keyframe offset</a> of 1,
44394439
a property value set to the <a>neutral value for composition</a>,
4440-
and a <a>composition operation</a> of <a
4441-
title="composition operation add">add</a>, and append it to the
4440+
and a <a>composite operation</a> of <a
4441+
title="composite operation add">add</a>, and append it to the
44424442
end of <var>property-specific keyframes</var>.
44434443
<li>Let <var>interval endpoints</var> be an empty sequence of
44444444
keyframes.
@@ -4474,18 +4474,18 @@ <h3>The intermediate animation value of a keyframe animation effect</h3>
44744474
</dl>
44754475
<li>For each <var>keyframe</var> in <var>interval endpoints</var>:
44764476
<ol>
4477-
<li>If <var>keyframe</var> has a <a>composition operation</a>
4477+
<li>If <var>keyframe</var> has a <a>composite operation</a>
44784478
that is <em>not</em> <a
4479-
title="composition operation replace">replace</a>, or
4480-
<var>keyframe</var> has no <a>composition operation</a>
4481-
and the <a>composition operation</a> of this <a>keyframe
4479+
title="composite operation replace">replace</a>, or
4480+
<var>keyframe</var> has no <a>composite operation</a>
4481+
and the <a>composite operation</a> of this <a>keyframe
44824482
animation effect</a> is <em>not</em> <a
4483-
title="composition operation replace">replace</a>, then
4483+
title="composite operation replace">replace</a>, then
44844484
perform the following steps:
44854485
<ol>
44864486
<li>Let <var>composite operation to use</var> be the
4487-
<a>composition operation</a> of <var>keyframe</var>, or if
4488-
it has none, the <a>composition operation</a> of this
4487+
<a>composite operation</a> of <var>keyframe</var>, or if
4488+
it has none, the <a>composite operation</a> of this
44894489
<a>keyframe animation effect</a>.
44904490
<li>Let <var>value to combine</var> be the property value of
44914491
<var>target property</var> specified on
@@ -4494,7 +4494,7 @@ <h3>The intermediate animation value of a keyframe animation effect</h3>
44944494
on <var>keyframe</var> with the result of combining
44954495
<var>underlying value</var> (<var>V</var><sub>a</sub>) and
44964496
<var>value to combine</var> (<var>V</var><sub>b</sub>)
4497-
using the <var>composition operation to use</var>
4497+
using the <var>composite operation to use</var>
44984498
procedure defined by the <var>target property</var>'s
44994499
<a>animation behavior</a>.
45004500
</ol>
@@ -5087,7 +5087,7 @@ <h3>The intermediate animation value of a motion path animation effect</h3>
50875087
Let the <var>unaccumulated value</var> be the result of
50885088
combining the <var>underlying value</var> (<var>V</var><sub>a</sub>)
50895089
with the <var>transform value</var> (<var>V</var><sub>b</sub>)
5090-
using the <a>composition operation</a> of the effect.
5090+
using the <a>composite operation</a> of the effect.
50915091
<li>Let the <var>intermediate animation value</var> be
50925092
<var>unaccumulated value</var>.
50935093
<li>
@@ -7031,7 +7031,7 @@ <h3>The <code>AnimationEffect</code> interface</h3>
70317031
<dt>attribute CompositeOperation composite</dt>
70327032
<dd>
70337033
<p>
7034-
The <a>composition operation</a> used to composite this
7034+
The <a>composite operation</a> used to composite this
70357035
<a>animation effect</a> with the <a>animation stack</a>, as
70367036
specified by one of the <a>CompositeOperation</a> enumeration
70377037
values.
@@ -7094,25 +7094,25 @@ <h3>The <code>CompositeOperation</code> enumeration</h3>
70947094
<dt>replace</dt>
70957095
<dd>
70967096
Corresponds to the <a
7097-
title="composition operation replace">replace</a>
7098-
<a>composition operation</a> value such that
7097+
title="composite operation replace">replace</a>
7098+
<a>composite operation</a> value such that
70997099
the <a>animation effect</a> overrides the <a>underlying value</a> it
71007100
is combined with.
71017101
</dd>
71027102
<dt>add</dt>
71037103
<dd>
71047104
Corresponds to the <a
7105-
title="composition operation add">add</a>
7106-
<a>composition operation</a> value such that
7105+
title="composite operation add">add</a>
7106+
<a>composite operation</a> value such that
71077107
the <a>animation effect</a> is <a
71087108
title="animation addition">added</a> to the <a>underlying value</a>
71097109
with which it is combined.
71107110
</dd>
71117111
<dt>accumulate</dt>
71127112
<dd>
71137113
Corresponds to the <a
7114-
title="composition operation accumulate">accumulate</a>
7115-
<a>composition operation</a> value such that
7114+
title="composite operation accumulate">accumulate</a>
7115+
<a>composite operation</a> value such that
71167116
the <a>animation effect</a> is <a
71177117
title="animation accumulation">accumulated</a> on to the
71187118
<a>underlying value</a>.
@@ -7314,11 +7314,11 @@ <h2>The <code>KeyframeEffectOptions</code> dictionary</h2>
73147314
</dd>
73157315
<dt>CompositeOperation composite = "replace"</dt>
73167316
<dd>
7317-
The <a>composition operation</a> used to composite this
7317+
The <a>composite operation</a> used to composite this
73187318
animation with the <a>animation stack</a>, as specified by one
73197319
of the <a>CompositeOperation</a> enumeration values.
73207320
This is used for all <a>keyframes</a> that do not specify
7321-
a <a>composition operation</a>.
7321+
a <a>composite operation</a>.
73227322
</dd>
73237323
<dt>DOMString spacing = "distribute"</dt>
73247324
<dd>
@@ -7436,11 +7436,11 @@ <h3>The <code>Keyframe</code> dictionary</h3>
74367436
<dt>CompositeOperation? composite = null</dt>
74377437
<dd>
74387438
<p>
7439-
The <a>composition operation</a> used to combine the values
7439+
The <a>composite operation</a> used to combine the values
74407440
specified in this keyframe with the <a>underlying value</a>.
74417441
</p>
74427442
<p>
7443-
If <code>null</code>, the <a>composition operation</a>
7443+
If <code>null</code>, the <a>composite operation</a>
74447444
specified on the <a>AnimationEffect</a> will be used.
74457445
</p>
74467446
</dd>
@@ -7728,7 +7728,7 @@ <h2>The <code>MotionPathEffectOptions</code> dictionary</h2>
77287728
</dd>
77297729
<dt>CompositeOperation composite = "replace"</dt>
77307730
<dd>
7731-
The <a>composition operation</a> used to composite this
7731+
The <a>composite operation</a> used to composite this
77327732
<a>animation effect</a> with the <a>animation stack</a>, as
77337733
specified by one of the <a>CompositeOperation</a> enumeration
77347734
values.
@@ -8271,10 +8271,10 @@ <h2>Changes since last publication</h2>
82718271
<a>animation target</a>.
82728272
<li>Made the <em>custom animation priority</em> specific to
82738273
a <a>player</a> and renamed it to the <a>custom player priority</a>.
8274-
<li>Made the <a>composition operation</a> a property of all
8274+
<li>Made the <a>composite operation</a> a property of all
82758275
<a>animation effects</a>.
8276-
<li>Added the <a title="composition operation accumulate">accumulate</a>
8277-
<a>composition operation</a>.
8276+
<li>Added the <a title="composite operation accumulate">accumulate</a>
8277+
<a>composite operation</a>.
82788278
<li>Replaced the accumulation operation with an
82798279
<a>iteration composite operation</a> on <a>animation effects</a>.
82808280
<li>Added per-<a>keyframe</a> <a>timing functions</a>.

0 commit comments

Comments
 (0)