Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 08:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge similar arms in AnimationValue::animate 🐉🐲

Browse source 
This uses the same trick as in PropertyDeclaration::eq and removes
roughly 10KB off of libxul.
This commit is contained in:
Anthony Ramine 2018-02-10 03:49:11 +01:00
parent 38520af970
commit fc24cf34c5
1 changed files with 41 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

68
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -566,35 +566,49 @@ fn animate_discrete<T: Clone>(this: &T, other: &T, procedure: Procedure) -> Resu
impl Animate for AnimationValue { impl Animate for AnimationValue {
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> { fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
let value = match (self, other) { use self::AnimationValue::*;
% for prop in data.longhands:
% if prop.animatable: Ok(unsafe {
% if prop.animation_value_type != "discrete": #[repr(C)]
( struct AnimationValueVariantRepr<T> {
&AnimationValue::${prop.camel_case}(ref this), tag: u16,
&AnimationValue::${prop.camel_case}(ref other), value: T
) => { }
AnimationValue::${prop.camel_case}(
this.animate(other, procedure)?, let this_tag = *(self as *const _ as *const u16);
) let other_tag = *(other as *const _ as *const u16);
}, if this_tag != other_tag {
% else:
(
&AnimationValue::${prop.camel_case}(ref this),
&AnimationValue::${prop.camel_case}(ref other),
) => {
AnimationValue::${prop.camel_case}(
animate_discrete(this, other, procedure)?
)
},
% endif
% endif
% endfor
_ => {
panic!("Unexpected AnimationValue::animate call"); panic!("Unexpected AnimationValue::animate call");
} }
};
Ok(value) match *self {
<% keyfunc = lambda x: (x.animated_type(), x.animation_value_type == "discrete") %>
% for (ty, discrete), props in groupby(animated, key=keyfunc):
${" |\n".join("{}(ref this)".format(prop.camel_case) for prop in props)} => {
let other_repr =
&*(other as *const _ as *const AnimationValueVariantRepr<${ty}>);
% if discrete:
let value = animate_discrete(this, &other_repr.value, procedure)?;
% else:
let value = this.animate(&other_repr.value, procedure)?;
% endif
let mut out = mem::uninitialized();
ptr::write(
&mut out as *mut _ as *mut AnimationValueVariantRepr<${ty}>,
AnimationValueVariantRepr {
tag: this_tag,
value,
},
);
out
}
% endfor
${" |\n".join("{}(void)".format(prop.camel_case) for prop in unanimated)} => {
void::unreachable(void)
}
}
})
} }
} }