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

Auto merge of #17157 - upsuper:animation-type, r=<try>

Browse source 
Remove some redundant animation interpolation code

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17157)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-06-04 19:34:05 -07:00 • committed by GitHub
commit 67eaae82ed
2 changed files with 79 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -294,9 +294,14 @@ impl<'a> From<TransitionProperty> for PropertyDeclarationId<'a> {
pub enum AnimatedProperty { pub enum AnimatedProperty {
% for prop in data.longhands: % for prop in data.longhands:
% if prop.animatable: % if prop.animatable:
<%
if prop.is_animatable_with_computed_value:
value_type = "longhands::{}::computed_value::T".format(prop.ident)
else:
value_type = prop.animation_value_type
%>
/// ${prop.name} /// ${prop.name}
${prop.camel_case}(longhands::${prop.ident}::computed_value::T, ${prop.camel_case}(${value_type}, ${value_type}),
longhands::${prop.ident}::computed_value::T),
% endif % endif
% endfor % endfor
} }
@ -356,6 +361,9 @@ impl AnimatedProperty {
Err(()) => return, Err(()) => return,
}; };
% endif % endif
% if not prop.is_animatable_with_computed_value:
let value: longhands::${prop.ident}::computed_value::T = value.into();
% endif
style.mutate_${prop.style_struct.ident.strip("_")}().set_${prop.ident}(value); style.mutate_${prop.style_struct.ident.strip("_")}().set_${prop.ident}(value);
} }
% endif % endif
@ -375,8 +383,8 @@ impl AnimatedProperty {
% if prop.animatable: % if prop.animatable:
TransitionProperty::${prop.camel_case} => { TransitionProperty::${prop.camel_case} => {
AnimatedProperty::${prop.camel_case}( AnimatedProperty::${prop.camel_case}(
old_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}(), old_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}().into(),
new_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}()) new_style.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}().into())
} }
% endif % endif
% endfor % endfor
@ -440,7 +448,7 @@ impl AnimationValue {
% if prop.is_animatable_with_computed_value: % if prop.is_animatable_with_computed_value:
from from
% else: % else:
&from.into() &from.clone().into()
% endif % endif
)) ))
% if prop.boxed: % if prop.boxed:
@ -472,7 +480,7 @@ impl AnimationValue {
% if prop.is_animatable_with_computed_value: % if prop.is_animatable_with_computed_value:
val.to_computed_value(context) val.to_computed_value(context)
% else: % else:
From::from(&val.to_computed_value(context)) From::from(val.to_computed_value(context))
% endif % endif
)) ))
}, },
@ -503,7 +511,7 @@ impl AnimationValue {
}, },
}; };
% if not prop.is_animatable_with_computed_value: % if not prop.is_animatable_with_computed_value:
let computed = From::from(&computed); let computed = From::from(computed);
% endif % endif
Some(AnimationValue::${prop.camel_case}(computed)) Some(AnimationValue::${prop.camel_case}(computed))
}, },
@ -570,8 +578,8 @@ impl AnimationValue {
% if prop.is_animatable_with_computed_value: % if prop.is_animatable_with_computed_value:
computed_values.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}()) computed_values.get_${prop.style_struct.ident.strip("_")}().clone_${prop.ident}())
% else: % else:
From::from(&computed_values.get_${prop.style_struct.ident.strip("_")}() From::from(computed_values.get_${prop.style_struct.ident.strip("_")}()
.clone_${prop.ident}())) .clone_${prop.ident}()))
% endif % endif
} }
% endif % endif
@ -936,96 +944,6 @@ impl Animatable for BackgroundSizeList {
} }
} }
/// https://drafts.csswg.org/css-transitions/#animtype-color
impl Animatable for RGBA {
#[inline]
fn add_weighted(&self, other: &RGBA, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
fn clamp(val: f32) -> f32 {
val.max(0.).min(1.)
}
let alpha = clamp(try!(self.alpha_f32().add_weighted(&other.alpha_f32(),
self_portion, other_portion)));
if alpha == 0. {
Ok(RGBA::transparent())
} else {
// NB: We rely on RGBA::from_floats clamping already.
let red = try!((self.red_f32() * self.alpha_f32())
.add_weighted(&(other.red_f32() * other.alpha_f32()),
self_portion, other_portion))
* 1. / alpha;
let green = try!((self.green_f32() * self.alpha_f32())
.add_weighted(&(other.green_f32() * other.alpha_f32()),
self_portion, other_portion))
* 1. / alpha;
let blue = try!((self.blue_f32() * self.alpha_f32())
.add_weighted(&(other.blue_f32() * other.alpha_f32()),
self_portion, other_portion))
* 1. / alpha;
Ok(RGBA::from_floats(red, green, blue, alpha))
}
}
/// https://www.w3.org/TR/smil-animation/#animateColorElement says we should use Euclidean
/// RGB-cube distance.
#[inline]
fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
self.compute_squared_distance(other).map(|sd| sd.sqrt())
}
#[inline]
fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
fn clamp(val: f32) -> f32 {
val.max(0.).min(1.)
}
let start_a = clamp(self.alpha_f32());
let end_a = clamp(other.alpha_f32());
let start = [ start_a,
self.red_f32() * start_a,
self.green_f32() * start_a,
self.blue_f32() * start_a ];
let end = [ end_a,
other.red_f32() * end_a,
other.green_f32() * end_a,
other.blue_f32() * end_a ];
let diff = start.iter().zip(&end)
.fold(0.0f64, |n, (&a, &b)| {
let diff = (a - b) as f64;
n + diff * diff
});
Ok(diff)
}
}
/// https://drafts.csswg.org/css-transitions/#animtype-color
impl Animatable for CSSParserColor {
#[inline]
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
match (*self, *other) {
(CSSParserColor::RGBA(ref this), CSSParserColor::RGBA(ref other)) => {
this.add_weighted(other, self_portion, other_portion).map(CSSParserColor::RGBA)
}
_ => Err(()),
}
}
#[inline]
fn compute_distance(&self, other: &Self) -> Result<f64, ()> {
self.compute_squared_distance(other).map(|sq| sq.sqrt())
}
#[inline]
fn compute_squared_distance(&self, other: &Self) -> Result<f64, ()> {
match (*self, *other) {
(CSSParserColor::RGBA(ref this), CSSParserColor::RGBA(ref other)) => {
this.compute_squared_distance(other)
},
_ => Ok(0.0),
}
}
}
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc /// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
impl Animatable for CalcLengthOrPercentage { impl Animatable for CalcLengthOrPercentage {
#[inline] #[inline]
@ -1569,9 +1487,6 @@ impl Animatable for ClipRect {
} }
</%def> </%def>
${impl_animatable_for_shadow('BoxShadow', 'CSSParserColor::RGBA(RGBA::transparent())',)}
${impl_animatable_for_shadow('TextShadow', 'CSSParserColor::RGBA(RGBA::transparent())',)}
/// Check if it's possible to do a direct numerical interpolation /// Check if it's possible to do a direct numerical interpolation
/// between these two transform lists. /// between these two transform lists.
/// http://dev.w3.org/csswg/css-transforms/#transform-transform-animation /// http://dev.w3.org/csswg/css-transforms/#transform-transform-animation
@ -2626,8 +2541,8 @@ impl<T, U> Animatable for Either<T, U>
} }
} }
impl <'a> From<<&'a IntermediateRGBA> for RGBA { impl From<IntermediateRGBA> for RGBA {
fn from(extended_rgba: &IntermediateRGBA) -> RGBA { fn from(extended_rgba: IntermediateRGBA) -> RGBA {
// RGBA::from_floats clamps each component values. // RGBA::from_floats clamps each component values.
RGBA::from_floats(extended_rgba.red, RGBA::from_floats(extended_rgba.red,
extended_rgba.green, extended_rgba.green,
@ -2636,8 +2551,8 @@ impl <'a> From<<&'a IntermediateRGBA> for RGBA {
} }
} }
impl <'a> From<<&'a RGBA> for IntermediateRGBA { impl From<RGBA> for IntermediateRGBA {
fn from(rgba: &RGBA) -> IntermediateRGBA { fn from(rgba: RGBA) -> IntermediateRGBA {
IntermediateRGBA::new(rgba.red_f32(), IntermediateRGBA::new(rgba.red_f32(),
rgba.green_f32(), rgba.green_f32(),
rgba.blue_f32(), rgba.blue_f32(),
@ -2725,12 +2640,12 @@ impl Animatable for IntermediateRGBA {
} }
} }
impl<'a> From<<&'a Either<CSSParserColor, Auto>> for Either<IntermediateColor, Auto> { impl From<Either<CSSParserColor, Auto>> for Either<IntermediateColor, Auto> {
fn from(from: &Either<CSSParserColor, Auto>) -> Either<IntermediateColor, Auto> { fn from(from: Either<CSSParserColor, Auto>) -> Either<IntermediateColor, Auto> {
match *from { match from {
Either::First(ref from) => Either::First(from) =>
match *from { match from {
CSSParserColor::RGBA(ref color) => CSSParserColor::RGBA(color) =>
Either::First(IntermediateColor::IntermediateRGBA( Either::First(IntermediateColor::IntermediateRGBA(
IntermediateRGBA::new(color.red_f32(), IntermediateRGBA::new(color.red_f32(),
color.green_f32(), color.green_f32(),
@ -2744,12 +2659,12 @@ impl<'a> From<<&'a Either<CSSParserColor, Auto>> for Either<IntermediateColor, A
} }
} }
impl<'a> From<<&'a Either<IntermediateColor, Auto>> for Either<CSSParserColor, Auto> { impl From<Either<IntermediateColor, Auto>> for Either<CSSParserColor, Auto> {
fn from(from: &Either<IntermediateColor, Auto>) -> Either<CSSParserColor, Auto> { fn from(from: Either<IntermediateColor, Auto>) -> Either<CSSParserColor, Auto> {
match *from { match from {
Either::First(ref from) => Either::First(from) =>
match *from { match from {
IntermediateColor::IntermediateRGBA(ref color) => IntermediateColor::IntermediateRGBA(color) =>
Either::First(CSSParserColor::RGBA(RGBA::from_floats(color.red, Either::First(CSSParserColor::RGBA(RGBA::from_floats(color.red,
color.green, color.green,
color.blue, color.blue,
@ -2800,10 +2715,10 @@ impl Animatable for IntermediateColor {
} }
} }
impl <'a> From<<&'a CSSParserColor> for IntermediateColor { impl From<CSSParserColor> for IntermediateColor {
fn from(color: &CSSParserColor) -> IntermediateColor { fn from(color: CSSParserColor) -> IntermediateColor {
match *color { match color {
CSSParserColor::RGBA(ref color) => CSSParserColor::RGBA(color) =>
IntermediateColor::IntermediateRGBA(IntermediateRGBA::new(color.red_f32(), IntermediateColor::IntermediateRGBA(IntermediateRGBA::new(color.red_f32(),
color.green_f32(), color.green_f32(),
color.blue_f32(), color.blue_f32(),
@ -2813,10 +2728,10 @@ impl <'a> From<<&'a CSSParserColor> for IntermediateColor {
} }
} }
impl <'a> From<<&'a IntermediateColor> for CSSParserColor { impl From<IntermediateColor> for CSSParserColor {
fn from(color: &IntermediateColor) -> CSSParserColor { fn from(color: IntermediateColor) -> CSSParserColor {
match *color { match color {
IntermediateColor::IntermediateRGBA(ref color) => IntermediateColor::IntermediateRGBA(color) =>
CSSParserColor::RGBA(RGBA::from_floats(color.red, CSSParserColor::RGBA(RGBA::from_floats(color.red,
color.green, color.green,
color.blue, color.blue,
@ -2850,25 +2765,25 @@ impl <'a> From<<&'a IntermediateColor> for CSSParserColor {
/// Intermediate type for box-shadow list and text-shadow list. /// Intermediate type for box-shadow list and text-shadow list.
pub struct Intermediate${type}ShadowList(pub SmallVec<[Intermediate${type}Shadow; 1]>); pub struct Intermediate${type}ShadowList(pub SmallVec<[Intermediate${type}Shadow; 1]>);
impl <'a> From<<&'a Intermediate${type}ShadowList> for ${type}ShadowList { impl From<Intermediate${type}ShadowList> for ${type}ShadowList {
fn from(shadow_list: &Intermediate${type}ShadowList) -> ${type}ShadowList { fn from(shadow_list: Intermediate${type}ShadowList) -> ${type}ShadowList {
${type}ShadowList(shadow_list.0.iter().map(|s| s.into()).collect()) ${type}ShadowList(shadow_list.0.into_iter().map(|s| s.into()).collect())
} }
} }
impl <'a> From<<&'a ${type}ShadowList> for Intermediate${type}ShadowList { impl From<${type}ShadowList> for Intermediate${type}ShadowList {
fn from(shadow_list: &${type}ShadowList) -> Intermediate${type}ShadowList { fn from(shadow_list: ${type}ShadowList) -> Intermediate${type}ShadowList {
Intermediate${type}ShadowList(shadow_list.0.iter().map(|s| s.into()).collect()) Intermediate${type}ShadowList(shadow_list.0.into_iter().map(|s| s.into()).collect())
} }
} }
impl <'a> From<<&'a Intermediate${type}Shadow> for ${type}Shadow { impl From<Intermediate${type}Shadow> for ${type}Shadow {
fn from(shadow: &Intermediate${type}Shadow) -> ${type}Shadow { fn from(shadow: Intermediate${type}Shadow) -> ${type}Shadow {
${type}Shadow { ${type}Shadow {
offset_x: shadow.offset_x, offset_x: shadow.offset_x,
offset_y: shadow.offset_y, offset_y: shadow.offset_y,
blur_radius: shadow.blur_radius, blur_radius: shadow.blur_radius,
color: (&shadow.color).into(), color: shadow.color.into(),
% if type == "Box": % if type == "Box":
spread_radius: shadow.spread_radius, spread_radius: shadow.spread_radius,
inset: shadow.inset, inset: shadow.inset,
@ -2877,13 +2792,13 @@ impl <'a> From<<&'a IntermediateColor> for CSSParserColor {
} }
} }
impl <'a> From<<&'a ${type}Shadow> for Intermediate${type}Shadow { impl From<${type}Shadow> for Intermediate${type}Shadow {
fn from(shadow: &${type}Shadow) -> Intermediate${type}Shadow { fn from(shadow: ${type}Shadow) -> Intermediate${type}Shadow {
Intermediate${type}Shadow { Intermediate${type}Shadow {
offset_x: shadow.offset_x, offset_x: shadow.offset_x,
offset_y: shadow.offset_y, offset_y: shadow.offset_y,
blur_radius: shadow.blur_radius, blur_radius: shadow.blur_radius,
color: (&shadow.color).into(), color: shadow.color.into(),
% if type == "Box": % if type == "Box":
spread_radius: shadow.spread_radius, spread_radius: shadow.spread_radius,
inset: shadow.inset, inset: shadow.inset,

46
tests/unit/style/animated_properties.rs
View file

@ -2,49 +2,55 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{Color, RGBA}; use cssparser::RGBA;
use style::properties::animated_properties::Animatable; use style::properties::animated_properties::{Animatable, IntermediateRGBA};
fn interpolate_rgba(from: RGBA, to: RGBA, progress: f64) -> RGBA {
let from: IntermediateRGBA = from.into();
let to: IntermediateRGBA = to.into();
from.interpolate(&to, progress).unwrap().into()
}
#[test] #[test]
fn test_rgba_color_interepolation_preserves_transparent() { fn test_rgba_color_interepolation_preserves_transparent() {
assert_eq!(Color::RGBA(RGBA::transparent()) assert_eq!(interpolate_rgba(RGBA::transparent(),
.interpolate(&Color::RGBA(RGBA::transparent()), 0.5).unwrap(), RGBA::transparent(), 0.5),
Color::RGBA(RGBA::transparent())); RGBA::transparent());
} }
#[test] #[test]
fn test_rgba_color_interepolation_alpha() { fn test_rgba_color_interepolation_alpha() {
assert_eq!(Color::RGBA(RGBA::new(200, 0, 0, 100)) assert_eq!(interpolate_rgba(RGBA::new(200, 0, 0, 100),
.interpolate(&Color::RGBA(RGBA::new(0, 200, 0, 200)), 0.5).unwrap(), RGBA::new(0, 200, 0, 200), 0.5),
Color::RGBA(RGBA::new(67, 133, 0, 150))); RGBA::new(67, 133, 0, 150));
} }
#[test] #[test]
fn test_rgba_color_interepolation_out_of_range_1() { fn test_rgba_color_interepolation_out_of_range_1() {
// Some cubic-bezier functions produce values that are out of range [0, 1]. // Some cubic-bezier functions produce values that are out of range [0, 1].
// Unclamped cases. // Unclamped cases.
assert_eq!(Color::RGBA(RGBA::from_floats(0.3, 0.0, 0.0, 0.4)).interpolate( assert_eq!(interpolate_rgba(RGBA::from_floats(0.3, 0.0, 0.0, 0.4),
&Color::RGBA(RGBA::from_floats(0.0, 1.0, 0.0, 0.6)), -0.5).unwrap(), RGBA::from_floats(0.0, 1.0, 0.0, 0.6), -0.5),
Color::RGBA(RGBA::new(154, 0, 0, 77))); RGBA::new(154, 0, 0, 77));
} }
#[test] #[test]
fn test_rgba_color_interepolation_out_of_range_2() { fn test_rgba_color_interepolation_out_of_range_2() {
assert_eq!(Color::RGBA(RGBA::from_floats(1.0, 0.0, 0.0, 0.6)).interpolate( assert_eq!(interpolate_rgba(RGBA::from_floats(1.0, 0.0, 0.0, 0.6),
&Color::RGBA(RGBA::from_floats(0.0, 0.3, 0.0, 0.4)), 1.5).unwrap(), RGBA::from_floats(0.0, 0.3, 0.0, 0.4), 1.5),
Color::RGBA(RGBA::new(0, 154, 0, 77))); RGBA::new(0, 154, 0, 77));
} }
#[test] #[test]
fn test_rgba_color_interepolation_out_of_range_clamped_1() { fn test_rgba_color_interepolation_out_of_range_clamped_1() {
assert_eq!(Color::RGBA(RGBA::from_floats(1.0, 0.0, 0.0, 0.8)).interpolate( assert_eq!(interpolate_rgba(RGBA::from_floats(1.0, 0.0, 0.0, 0.8),
&Color::RGBA(RGBA::from_floats(0.0, 1.0, 0.0, 0.2)), -0.5).unwrap(), RGBA::from_floats(0.0, 1.0, 0.0, 0.2), -0.5),
Color::RGBA(RGBA::from_floats(1.0, 0.0, 0.0, 1.0))); RGBA::from_floats(1.0, 0.0, 0.0, 1.0));
} }
#[test] #[test]
fn test_rgba_color_interepolation_out_of_range_clamped_2() { fn test_rgba_color_interepolation_out_of_range_clamped_2() {
assert_eq!(Color::RGBA(RGBA::from_floats(1.0, 0.0, 0.0, 0.8)).interpolate( assert_eq!(interpolate_rgba(RGBA::from_floats(1.0, 0.0, 0.0, 0.8),
&Color::RGBA(RGBA::from_floats(0.0, 1.0, 0.0, 0.2)), 1.5).unwrap(), RGBA::from_floats(0.0, 1.0, 0.0, 0.2), 1.5),
Color::RGBA(RGBA::from_floats(0.0, 0.0, 0.0, 0.0))); RGBA::from_floats(0.0, 0.0, 0.0, 0.0));
} }