Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #19580 - Update references to Web Animations spec (from birtles:update-web-animations-link); r=hiro

Browse Source 
This has been reviewed in [Gecko bug 1425548](https://bugzilla.mozilla.org/show_bug.cgi?id=1425548).

Source-Repo: https://github.com/servo/servo
Source-Revision: f7440bf1a68cd0beaf12621c9c460c6f6ddc57e3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : be54a712cafe4eb7fb42bc073bd687f6fd0220cb
This commit is contained in:
Brian Birtles 2017-12-15 17:39:55 -06:00
parent 2d8d0b4c2c
commit f464fbbad3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
servo/components/style/properties/helpers/animated_properties.mako.rs
View File

@ -262,7 +262,7 @@ impl AnimatedProperty {
% for prop in data.longhands:
% if prop.animatable:
AnimatedProperty::${prop.camel_case}(ref from, ref to) => {
// https://w3c.github.io/web-animations/#discrete-animation-type
// https://drafts.csswg.org/web-animations/#discrete-animation-type
% if prop.animation_value_type == "discrete":
let value = if progress < 0.5 { from.clone() } else { to.clone() };
% else:
@ -2833,7 +2833,7 @@ impl ComputeSquaredDistance for AnimatedFilterList {
///
/// border-top-color, border-color, border-top, border
///
/// [property-order] https://w3c.github.io/web-animations/#calculating-computed-keyframes
/// [property-order] https://drafts.csswg.org/web-animations/#calculating-computed-keyframes
#[cfg(feature = "gecko")]
pub fn compare_property_priority(a: &PropertyId, b: &PropertyId) -> cmp::Ordering {
match (a.as_shorthand(), b.as_shorthand()) {

8
servo/components/style/values/animated/mod.rs
View File

@ -48,15 +48,15 @@ pub trait Animate: Sized {
/// An animation procedure.
///
/// <https://w3c.github.io/web-animations/#procedures-for-animating-properties>
/// <https://drafts.csswg.org/web-animations/#procedures-for-animating-properties>
#[allow(missing_docs)]
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum Procedure {
/// <https://w3c.github.io/web-animations/#animation-interpolation>
/// <https://drafts.csswg.org/web-animations/#animation-interpolation>
Interpolate { progress: f64 },
/// <https://w3c.github.io/web-animations/#animation-addition>
/// <https://drafts.csswg.org/web-animations/#animation-addition>
Add,
/// <https://w3c.github.io/web-animations/#animation-accumulation>
/// <https://drafts.csswg.org/web-animations/#animation-accumulation>
Accumulate { count: u64 },
}