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

Allow cross interpolation between differing translate/scale functions

Browse source 
See ToPrimitive() in StyleAnimationValue.cpp
This commit is contained in:
Manish Goregaokar 2017-10-30 18:01:32 -07:00
parent f699b8cfb2
commit 9c9a181f35
No known key found for this signature in database
GPG key ID: 3BBF4D3E2EF79F98
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1226,7 +1226,12 @@ impl Animate for ComputedTransformOperation {
fd_matrix.animate(&td_matrix, procedure)?,
))
},
// XXXManishearth handle crossover between translate and scale functions
(ref f, ref t) if f.is_translate() && t.is_translate() => {
f.to_translate_3d().animate(&t.to_translate_3d(), procedure)
}
(ref f, ref t) if f.is_scale() && t.is_scale() => {
f.to_scale_3d().animate(&t.to_scale_3d(), procedure)
}
_ => Err(()),
}
}

5
components/style/values/computed/length.rs
View file

@ -706,6 +706,11 @@ impl CSSPixelLength {
pub fn abs(self) -> Self {
CSSPixelLength::new(self.0.abs())
}
/// Zero value
pub fn zero() -> Self {
CSSPixelLength::new(0.)
}
}
impl ToCss for CSSPixelLength {

1
components/style/values/generics/transform.rs
View file

@ -249,7 +249,6 @@ pub struct Transform<T>(pub Vec<T>);
impl<Angle, Number, Length, Integer, LengthOrNumber, LengthOrPercentage, LoPoNumber>
TransformOperation<Angle, Number, Length, Integer, LengthOrNumber, LengthOrPercentage, LoPoNumber> {
/// Check if it is any translate function
pub fn is_translate(&self) -> bool {
use self::TransformOperation::*;

2
components/style/values/specified/transform.rs
View file

@ -10,8 +10,8 @@ use selectors::parser::SelectorParseErrorKind;
use style_traits::{ParseError, StyleParseErrorKind};
use values::computed::{Context, LengthOrPercentage as ComputedLengthOrPercentage};
use values::computed::{Percentage as ComputedPercentage, ToComputedValue};
use values::generics::transform::{Matrix3D, Transform as GenericTransform};
use values::computed::transform::TimingFunction as ComputedTimingFunction;
use values::generics::transform::{Matrix3D, Transform as GenericTransform};
use values::generics::transform::{StepPosition, TimingFunction as GenericTimingFunction, Matrix};
use values::generics::transform::{TimingKeyword, TransformOrigin as GenericTransformOrigin};
use values::generics::transform::TransformOperation as GenericTransformOperation;