Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify add_weighted_with_initial_val

Browse source
This commit is contained in:
Anthony Ramine 2017-08-21 12:04:28 +02:00
parent 54dc3e1670
commit 0cceeb9d5c
1 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1340,19 +1340,13 @@ impl ToAnimatedZero for TransformOperation {
} }
} }
/// A wrapper for calling add_weighted that interpolates the distance of the two values from fn add_weighted_multiplicative_factor(
/// an initial_value and uses that to produce an interpolated value. this: CSSFloat,
/// This is used for values such as 'scale' where the initial value is 1 and where if we interpolate other: CSSFloat,
/// the absolute values, we will produce odd results for accumulation. self_portion: f64,
fn add_weighted_with_initial_val<T: Animatable>(a: &T, other_portion: f64,
b: &T, ) -> Result<CSSFloat, ()> {
a_portion: f64, Ok((this - 1.).add_weighted(&(other - 1.), self_portion, other_portion)? + 1.)
b_portion: f64,
initial_val: &T) -> Result<T, ()> {
let a = a.add_weighted(&initial_val, 1.0, -1.0)?;
let b = b.add_weighted(&initial_val, 1.0, -1.0)?;
let result = a.add_weighted(&b, a_portion, b_portion)?;
result.add_weighted(&initial_val, 1.0, 1.0)
} }
/// http://dev.w3.org/csswg/css-transforms/#interpolation-of-transforms /// http://dev.w3.org/csswg/css-transforms/#interpolation-of-transforms
@ -1396,9 +1390,9 @@ impl Animatable for TransformOperation {
&TransformOperation::Scale(ref tx, ref ty, ref tz), &TransformOperation::Scale(ref tx, ref ty, ref tz),
) => { ) => {
Ok(TransformOperation::Scale( Ok(TransformOperation::Scale(
add_weighted_with_initial_val(fx, tx, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(*fx, *tx, self_portion, other_portion)?,
add_weighted_with_initial_val(fy, ty, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(*fy, *ty, self_portion, other_portion)?,
add_weighted_with_initial_val(fz, tz, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(*fz, *tz, self_portion, other_portion)?,
)) ))
}, },
( (
@ -1508,12 +1502,10 @@ pub struct MatrixDecomposed2D {
impl Animatable for InnerMatrix2D { impl Animatable for InnerMatrix2D {
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> { fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
Ok(InnerMatrix2D { Ok(InnerMatrix2D {
m11: add_weighted_with_initial_val(&self.m11, &other.m11, m11: add_weighted_multiplicative_factor(self.m11, other.m11, self_portion, other_portion)?,
self_portion, other_portion, &1.0)?,
m12: self.m12.add_weighted(&other.m12, self_portion, other_portion)?, m12: self.m12.add_weighted(&other.m12, self_portion, other_portion)?,
m21: self.m21.add_weighted(&other.m21, self_portion, other_portion)?, m21: self.m21.add_weighted(&other.m21, self_portion, other_portion)?,
m22: add_weighted_with_initial_val(&self.m22, &other.m22, m22: add_weighted_multiplicative_factor(self.m22, other.m22, self_portion, other_portion)?,
self_portion, other_portion, &1.0)?,
}) })
} }
} }
@ -1530,8 +1522,8 @@ impl Animatable for Translate2D {
impl Animatable for Scale2D { impl Animatable for Scale2D {
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> { fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
Ok(Scale2D( Ok(Scale2D(
add_weighted_with_initial_val(&self.0, &other.0, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.0, other.0, self_portion, other_portion)?,
add_weighted_with_initial_val(&self.1, &other.1, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.1, other.1, self_portion, other_portion)?,
)) ))
} }
} }
@ -2065,9 +2057,9 @@ impl Animatable for Translate3D {
impl Animatable for Scale3D { impl Animatable for Scale3D {
fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> { fn add_weighted(&self, other: &Self, self_portion: f64, other_portion: f64) -> Result<Self, ()> {
Ok(Scale3D( Ok(Scale3D(
add_weighted_with_initial_val(&self.0, &other.0, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.0, other.0, self_portion, other_portion)?,
add_weighted_with_initial_val(&self.1, &other.1, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.1, other.1, self_portion, other_portion)?,
add_weighted_with_initial_val(&self.2, &other.2, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.2, other.2, self_portion, other_portion)?,
)) ))
} }
} }
@ -2099,7 +2091,7 @@ impl Animatable for Perspective {
self.0.add_weighted(&other.0, self_portion, other_portion)?, self.0.add_weighted(&other.0, self_portion, other_portion)?,
self.1.add_weighted(&other.1, self_portion, other_portion)?, self.1.add_weighted(&other.1, self_portion, other_portion)?,
self.2.add_weighted(&other.2, self_portion, other_portion)?, self.2.add_weighted(&other.2, self_portion, other_portion)?,
add_weighted_with_initial_val(&self.3, &other.3, self_portion, other_portion, &1.0)?, add_weighted_multiplicative_factor(self.3, other.3, self_portion, other_portion)?,
)) ))
} }
} }
@ -2978,13 +2970,12 @@ impl Animatable for AnimatedFilter {
% endfor % endfor
% for func in ['Brightness', 'Contrast', 'Opacity', 'Saturate']: % for func in ['Brightness', 'Contrast', 'Opacity', 'Saturate']:
(&Filter::${func}(ref this), &Filter::${func}(ref other)) => { (&Filter::${func}(ref this), &Filter::${func}(ref other)) => {
Ok(Filter::${func}(add_weighted_with_initial_val( Ok(Filter::${func}(NonNegative(add_weighted_multiplicative_factor(
this, this.0,
other, other.0,
self_portion, self_portion,
other_portion, other_portion,
&NonNegative::<CSSFloat>(1.0), )?)))
)?))
}, },
% endfor % endfor
% if product == "gecko": % if product == "gecko":