diff --git a/css-color-5/Overview.bs b/css-color-5/Overview.bs index c35f720c65b9..240843095d65 100644 --- a/css-color-5/Overview.bs +++ b/css-color-5/Overview.bs @@ -295,12 +295,14 @@ Otherwise, use the specified colorspace for mixing. 1. [=Normalize mix percentages=] from the list of [=mix items=] passed to the function, with the "forced normalization" flag set to true, letting |items| and |leftover| be the result. + + 2. Let |alpha mult| be 1 - |leftover|, interpreting |leftover| as a number between 0 and 1. - 4. If |items| is length 1, + 3. If |items| is length 1, set |color| to the color of that sole item, converted to the specified interpolation <>. @@ -314,7 +316,10 @@ Otherwise, use the specified colorspace for mixing. Let |combined percentage| be the sum of |a| and |b|’s percentages. 2. Interpolate |a| and |b|’s colors as described in [[css-color-4#interpolation]], - with a progress percentage equal to (|b|’s percentage) / |combined percentage|). + with a progress percentage equal to + (|b|’s percentage) / |combined percentage|), + if |combined percentage| is greater than 0, + and 0.5 otherwise. If the specified color space is a [=cylindrical polar color=] space, then the <> controls the interpolation of hue, as described in @@ -325,8 +330,8 @@ Otherwise, use the specified colorspace for mixing. and a percentage of |combined percentage|, and [=stack/push=] it onto |item stack|. 3. Set |color| to the color of the sole remaining item in |item stack|. - 5. Multiply the alpha component of |color| by |alpha mult|. - 6. Return |color|. + 4. Multiply the alpha component of |color| by |alpha mult|. + 5. Return |color|. Note: In [=cylindrical polar color=] spaces, mixing is order-dependent, @@ -3905,6 +3910,16 @@ This specification adds a way to ensure adequate contrast for text whose backgro diff --git a/web-animations-2/Overview.bs b/web-animations-2/Overview.bs index 40e29fa13102..757a38cde2af 100644 --- a/web-animations-2/Overview.bs +++ b/web-animations-2/Overview.bs @@ -2190,7 +2190,7 @@ as follows: : replace :: Each successive iteration is calculated independently of previous iterations. -: accumulate +: accumulate :: Successive iterations of the animation are accumulated with the final value of the previous iteration. @@ -3405,6 +3405,8 @@ partial dictionary KeyframeEffectOptions { :: The iteration composite operation used to define the way animation values build from iteration to iteration. + +

The IterationCompositeOperation enumeration

The possible values of an animation effect's