mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
style: Refactor all the animated properties to use the style system properly
This commit is contained in:
Emilio Cobos Álvarez
parent
818bc6d4a2
commit
6a362ae8e8
11 changed files with 929 additions and 1124 deletions
|
|
@ -6,36 +6,17 @@
|
|||
|
||||
use app_units::Au;
|
||||
use bezier::Bezier;
|
||||
use cssparser::{Color, RGBA};
|
||||
use dom::{OpaqueNode, TRestyleDamage};
|
||||
use euclid::point::Point2D;
|
||||
use properties::longhands::background_position::computed_value::T as BackgroundPosition;
|
||||
use properties::longhands::border_spacing::computed_value::T as BorderSpacing;
|
||||
use properties::longhands::clip::computed_value::ClipRect;
|
||||
use properties::longhands::font_weight::computed_value::T as FontWeight;
|
||||
use properties::longhands::line_height::computed_value::T as LineHeight;
|
||||
use properties::longhands::text_shadow::computed_value::T as TextShadowList;
|
||||
use properties::longhands::text_shadow::computed_value::TextShadow;
|
||||
use properties::longhands::transform::computed_value::ComputedMatrix;
|
||||
use properties::longhands::transform::computed_value::ComputedOperation as TransformOperation;
|
||||
use properties::longhands::transform::computed_value::T as TransformList;
|
||||
use properties::longhands::transition_property;
|
||||
use properties::longhands::transition_property::computed_value::TransitionProperty;
|
||||
use dom::{OpaqueNode, TRestyleDamage};
|
||||
use properties::animated_properties::{AnimatedProperty, TransitionProperty};
|
||||
use properties::longhands::transition_timing_function::computed_value::StartEnd;
|
||||
use properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction;
|
||||
use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
|
||||
use properties::longhands::visibility::computed_value::T as Visibility;
|
||||
use properties::longhands::z_index::computed_value::T as ZIndex;
|
||||
use properties::style_struct_traits::Box;
|
||||
use properties::{ComputedValues, ServoComputedValues};
|
||||
use std::cmp::Ordering;
|
||||
use std::iter::repeat;
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use time;
|
||||
use values::CSSFloat;
|
||||
use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
|
||||
use values::computed::{CalcLengthOrPercentage, Length, LengthOrPercentage, Time};
|
||||
use values::computed::Time;
|
||||
|
||||
/// State relating to an animation.
|
||||
#[derive(Clone)]
|
||||
|
|
@ -74,13 +55,18 @@ impl PropertyAnimation {
|
|||
old_style: &ServoComputedValues,
|
||||
new_style: &mut ServoComputedValues)
|
||||
-> Vec<PropertyAnimation> {
|
||||
let mut result = Vec::new();
|
||||
let transition_property =
|
||||
new_style.as_servo().get_box().transition_property.0[transition_index];
|
||||
let mut result = vec![];
|
||||
let box_style = new_style.as_servo().get_box();
|
||||
let transition_property = box_style.transition_property.0[transition_index];
|
||||
let timing_function = *box_style.transition_timing_function.0.get_mod(transition_index);
|
||||
let duration = *box_style.transition_duration.0.get_mod(transition_index);
|
||||
|
||||
|
||||
if transition_property != TransitionProperty::All {
|
||||
if let Some(property_animation) =
|
||||
PropertyAnimation::from_transition_property(transition_property,
|
||||
transition_index,
|
||||
timing_function,
|
||||
duration,
|
||||
old_style,
|
||||
new_style) {
|
||||
result.push(property_animation)
|
||||
|
|
@ -88,114 +74,40 @@ impl PropertyAnimation {
|
|||
return result
|
||||
}
|
||||
|
||||
for transition_property in
|
||||
transition_property::computed_value::ALL_TRANSITION_PROPERTIES.iter() {
|
||||
TransitionProperty::each(|transition_property| {
|
||||
if let Some(property_animation) =
|
||||
PropertyAnimation::from_transition_property(*transition_property,
|
||||
transition_index,
|
||||
PropertyAnimation::from_transition_property(transition_property,
|
||||
timing_function,
|
||||
duration,
|
||||
old_style,
|
||||
new_style) {
|
||||
result.push(property_animation)
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
fn from_transition_property(transition_property: TransitionProperty,
|
||||
transition_index: usize,
|
||||
timing_function: TransitionTimingFunction,
|
||||
duration: Time,
|
||||
old_style: &ServoComputedValues,
|
||||
new_style: &mut ServoComputedValues)
|
||||
new_style: &ServoComputedValues)
|
||||
-> Option<PropertyAnimation> {
|
||||
let box_style = new_style.get_box();
|
||||
macro_rules! match_transition {
|
||||
( $( [$name:ident; $structname:ident; $field:ident] ),* ) => {
|
||||
match transition_property {
|
||||
TransitionProperty::All => {
|
||||
panic!("Don't use `TransitionProperty::All` with \
|
||||
`PropertyAnimation::from_transition_property`!")
|
||||
}
|
||||
$(
|
||||
TransitionProperty::$name => {
|
||||
AnimatedProperty::$name(old_style.$structname().$field,
|
||||
new_style.$structname().$field)
|
||||
}
|
||||
)*
|
||||
TransitionProperty::Clip => {
|
||||
AnimatedProperty::Clip(old_style.get_effects().clip.0,
|
||||
new_style.get_effects().clip.0)
|
||||
}
|
||||
TransitionProperty::LetterSpacing => {
|
||||
AnimatedProperty::LetterSpacing(old_style.get_inheritedtext().letter_spacing.0,
|
||||
new_style.get_inheritedtext().letter_spacing.0)
|
||||
}
|
||||
TransitionProperty::TextShadow => {
|
||||
AnimatedProperty::TextShadow(old_style.get_inheritedtext().text_shadow.clone(),
|
||||
new_style.get_inheritedtext().text_shadow.clone())
|
||||
}
|
||||
TransitionProperty::Transform => {
|
||||
AnimatedProperty::Transform(old_style.get_effects().transform.clone(),
|
||||
new_style.get_effects().transform.clone())
|
||||
}
|
||||
TransitionProperty::WordSpacing => {
|
||||
AnimatedProperty::WordSpacing(old_style.get_inheritedtext().word_spacing.0,
|
||||
new_style.get_inheritedtext().word_spacing.0)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let animated_property = match_transition!(
|
||||
[BackgroundColor; get_background; background_color],
|
||||
[BackgroundPosition; get_background; background_position],
|
||||
[BorderBottomColor; get_border; border_bottom_color],
|
||||
[BorderBottomWidth; get_border; border_bottom_width],
|
||||
[BorderLeftColor; get_border; border_left_color],
|
||||
[BorderLeftWidth; get_border; border_left_width],
|
||||
[BorderRightColor; get_border; border_right_color],
|
||||
[BorderRightWidth; get_border; border_right_width],
|
||||
[BorderSpacing; get_inheritedtable; border_spacing],
|
||||
[BorderTopColor; get_border; border_top_color],
|
||||
[BorderTopWidth; get_border; border_top_width],
|
||||
[Bottom; get_position; bottom],
|
||||
[Color; get_color; color],
|
||||
[FontSize; get_font; font_size],
|
||||
[FontWeight; get_font; font_weight],
|
||||
[Height; get_position; height],
|
||||
[Left; get_position; left],
|
||||
[LineHeight; get_inheritedtext; line_height],
|
||||
[MarginBottom; get_margin; margin_bottom],
|
||||
[MarginLeft; get_margin; margin_left],
|
||||
[MarginRight; get_margin; margin_right],
|
||||
[MarginTop; get_margin; margin_top],
|
||||
[MaxHeight; get_position; max_height],
|
||||
[MaxWidth; get_position; max_width],
|
||||
[MinHeight; get_position; min_height],
|
||||
[MinWidth; get_position; min_width],
|
||||
[Opacity; get_effects; opacity],
|
||||
[OutlineColor; get_outline; outline_color],
|
||||
[OutlineWidth; get_outline; outline_width],
|
||||
[PaddingBottom; get_padding; padding_bottom],
|
||||
[PaddingLeft; get_padding; padding_left],
|
||||
[PaddingRight; get_padding; padding_right],
|
||||
[PaddingTop; get_padding; padding_top],
|
||||
[Right; get_position; right],
|
||||
[TextIndent; get_inheritedtext; text_indent],
|
||||
[Top; get_position; top],
|
||||
[VerticalAlign; get_box; vertical_align],
|
||||
[Visibility; get_inheritedbox; visibility],
|
||||
[Width; get_position; width],
|
||||
[ZIndex; get_position; z_index]);
|
||||
let animated_property = AnimatedProperty::from_transition_property(&transition_property,
|
||||
old_style,
|
||||
new_style);
|
||||
|
||||
let property_animation = PropertyAnimation {
|
||||
property: animated_property,
|
||||
timing_function:
|
||||
*box_style.transition_timing_function.0.get_mod(transition_index),
|
||||
duration: *box_style.transition_duration.0.get_mod(transition_index),
|
||||
timing_function: timing_function,
|
||||
duration: duration,
|
||||
};
|
||||
if property_animation.does_not_animate() {
|
||||
None
|
||||
} else {
|
||||
|
||||
if property_animation.does_animate() {
|
||||
Some(property_animation)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -215,725 +127,12 @@ impl PropertyAnimation {
|
|||
}
|
||||
};
|
||||
|
||||
macro_rules! match_property(
|
||||
( $( [$name:ident; $structname:ident; $field:ident] ),* ) => {
|
||||
match self.property {
|
||||
$(
|
||||
AnimatedProperty::$name(ref start, ref end) => {
|
||||
if let Some(value) = start.interpolate(end, progress) {
|
||||
style.$structname().$field = value
|
||||
}
|
||||
}
|
||||
)*
|
||||
AnimatedProperty::Clip(ref start, ref end) => {
|
||||
if let Some(value) = start.interpolate(end, progress) {
|
||||
style.mutate_effects().clip.0 = value
|
||||
}
|
||||
}
|
||||
AnimatedProperty::LetterSpacing(ref start, ref end) => {
|
||||
if let Some(value) = start.interpolate(end, progress) {
|
||||
style.mutate_inheritedtext().letter_spacing.0 = value
|
||||
}
|
||||
}
|
||||
AnimatedProperty::WordSpacing(ref start, ref end) => {
|
||||
if let Some(value) = start.interpolate(end, progress) {
|
||||
style.mutate_inheritedtext().word_spacing.0 = value
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
match_property!(
|
||||
[BackgroundColor; mutate_background; background_color],
|
||||
[BackgroundPosition; mutate_background; background_position],
|
||||
[BorderBottomColor; mutate_border; border_bottom_color],
|
||||
[BorderBottomWidth; mutate_border; border_bottom_width],
|
||||
[BorderLeftColor; mutate_border; border_left_color],
|
||||
[BorderLeftWidth; mutate_border; border_left_width],
|
||||
[BorderRightColor; mutate_border; border_right_color],
|
||||
[BorderRightWidth; mutate_border; border_right_width],
|
||||
[BorderSpacing; mutate_inheritedtable; border_spacing],
|
||||
[BorderTopColor; mutate_border; border_top_color],
|
||||
[BorderTopWidth; mutate_border; border_top_width],
|
||||
[Bottom; mutate_position; bottom],
|
||||
[Color; mutate_color; color],
|
||||
[FontSize; mutate_font; font_size],
|
||||
[FontWeight; mutate_font; font_weight],
|
||||
[Height; mutate_position; height],
|
||||
[Left; mutate_position; left],
|
||||
[LineHeight; mutate_inheritedtext; line_height],
|
||||
[MarginBottom; mutate_margin; margin_bottom],
|
||||
[MarginLeft; mutate_margin; margin_left],
|
||||
[MarginRight; mutate_margin; margin_right],
|
||||
[MarginTop; mutate_margin; margin_top],
|
||||
[MaxHeight; mutate_position; max_height],
|
||||
[MaxWidth; mutate_position; max_width],
|
||||
[MinHeight; mutate_position; min_height],
|
||||
[MinWidth; mutate_position; min_width],
|
||||
[Opacity; mutate_effects; opacity],
|
||||
[OutlineColor; mutate_outline; outline_color],
|
||||
[OutlineWidth; mutate_outline; outline_width],
|
||||
[PaddingBottom; mutate_padding; padding_bottom],
|
||||
[PaddingLeft; mutate_padding; padding_left],
|
||||
[PaddingRight; mutate_padding; padding_right],
|
||||
[PaddingTop; mutate_padding; padding_top],
|
||||
[Right; mutate_position; right],
|
||||
[TextIndent; mutate_inheritedtext; text_indent],
|
||||
[TextShadow; mutate_inheritedtext; text_shadow],
|
||||
[Top; mutate_position; top],
|
||||
[Transform; mutate_effects; transform],
|
||||
[VerticalAlign; mutate_box; vertical_align],
|
||||
[Visibility; mutate_inheritedbox; visibility],
|
||||
[Width; mutate_position; width],
|
||||
[ZIndex; mutate_position; z_index]);
|
||||
self.property.update(style, progress);
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn does_not_animate(&self) -> bool {
|
||||
self.property.does_not_animate() || self.duration == Time(0.0)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
enum AnimatedProperty {
|
||||
BackgroundColor(Color, Color),
|
||||
BackgroundPosition(BackgroundPosition, BackgroundPosition),
|
||||
BorderBottomColor(Color, Color),
|
||||
BorderBottomWidth(Length, Length),
|
||||
BorderLeftColor(Color, Color),
|
||||
BorderLeftWidth(Length, Length),
|
||||
BorderRightColor(Color, Color),
|
||||
BorderRightWidth(Length, Length),
|
||||
BorderSpacing(BorderSpacing, BorderSpacing),
|
||||
BorderTopColor(Color, Color),
|
||||
BorderTopWidth(Length, Length),
|
||||
Bottom(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
Color(RGBA, RGBA),
|
||||
Clip(Option<ClipRect>, Option<ClipRect>),
|
||||
FontSize(Length, Length),
|
||||
FontWeight(FontWeight, FontWeight),
|
||||
Height(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
Left(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
LetterSpacing(Option<Au>, Option<Au>),
|
||||
LineHeight(LineHeight, LineHeight),
|
||||
MarginBottom(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
MarginLeft(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
MarginRight(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
MarginTop(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
MaxHeight(LengthOrPercentageOrNone, LengthOrPercentageOrNone),
|
||||
MaxWidth(LengthOrPercentageOrNone, LengthOrPercentageOrNone),
|
||||
MinHeight(LengthOrPercentage, LengthOrPercentage),
|
||||
MinWidth(LengthOrPercentage, LengthOrPercentage),
|
||||
Opacity(CSSFloat, CSSFloat),
|
||||
OutlineColor(Color, Color),
|
||||
OutlineWidth(Length, Length),
|
||||
PaddingBottom(LengthOrPercentage, LengthOrPercentage),
|
||||
PaddingLeft(LengthOrPercentage, LengthOrPercentage),
|
||||
PaddingRight(LengthOrPercentage, LengthOrPercentage),
|
||||
PaddingTop(LengthOrPercentage, LengthOrPercentage),
|
||||
Right(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
TextIndent(LengthOrPercentage, LengthOrPercentage),
|
||||
TextShadow(TextShadowList, TextShadowList),
|
||||
Top(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
Transform(TransformList, TransformList),
|
||||
VerticalAlign(VerticalAlign, VerticalAlign),
|
||||
Visibility(Visibility, Visibility),
|
||||
Width(LengthOrPercentageOrAuto, LengthOrPercentageOrAuto),
|
||||
WordSpacing(Option<Au>, Option<Au>),
|
||||
ZIndex(ZIndex, ZIndex),
|
||||
}
|
||||
|
||||
impl AnimatedProperty {
|
||||
#[inline]
|
||||
fn does_not_animate(&self) -> bool {
|
||||
match *self {
|
||||
AnimatedProperty::Top(ref a, ref b) |
|
||||
AnimatedProperty::Right(ref a, ref b) |
|
||||
AnimatedProperty::Bottom(ref a, ref b) |
|
||||
AnimatedProperty::Left(ref a, ref b) |
|
||||
AnimatedProperty::MarginTop(ref a, ref b) |
|
||||
AnimatedProperty::MarginRight(ref a, ref b) |
|
||||
AnimatedProperty::MarginBottom(ref a, ref b) |
|
||||
AnimatedProperty::MarginLeft(ref a, ref b) |
|
||||
AnimatedProperty::Width(ref a, ref b) |
|
||||
AnimatedProperty::Height(ref a, ref b) => a == b,
|
||||
AnimatedProperty::MaxWidth(ref a, ref b) |
|
||||
AnimatedProperty::MaxHeight(ref a, ref b) => a == b,
|
||||
AnimatedProperty::MinWidth(ref a, ref b) |
|
||||
AnimatedProperty::MinHeight(ref a, ref b) |
|
||||
AnimatedProperty::TextIndent(ref a, ref b) => a == b,
|
||||
AnimatedProperty::FontSize(ref a, ref b) |
|
||||
AnimatedProperty::BorderTopWidth(ref a, ref b) |
|
||||
AnimatedProperty::BorderRightWidth(ref a, ref b) |
|
||||
AnimatedProperty::BorderBottomWidth(ref a, ref b) |
|
||||
AnimatedProperty::BorderLeftWidth(ref a, ref b) => a == b,
|
||||
AnimatedProperty::BorderTopColor(ref a, ref b) |
|
||||
AnimatedProperty::BorderRightColor(ref a, ref b) |
|
||||
AnimatedProperty::BorderBottomColor(ref a, ref b) |
|
||||
AnimatedProperty::BorderLeftColor(ref a, ref b) |
|
||||
AnimatedProperty::OutlineColor(ref a, ref b) |
|
||||
AnimatedProperty::BackgroundColor(ref a, ref b) => a == b,
|
||||
AnimatedProperty::PaddingTop(ref a, ref b) |
|
||||
AnimatedProperty::PaddingRight(ref a, ref b) |
|
||||
AnimatedProperty::PaddingBottom(ref a, ref b) |
|
||||
AnimatedProperty::PaddingLeft(ref a, ref b) => a == b,
|
||||
AnimatedProperty::LineHeight(ref a, ref b) => a == b,
|
||||
AnimatedProperty::LetterSpacing(ref a, ref b) => a == b,
|
||||
AnimatedProperty::BackgroundPosition(ref a, ref b) => a == b,
|
||||
AnimatedProperty::BorderSpacing(ref a, ref b) => a == b,
|
||||
AnimatedProperty::Clip(ref a, ref b) => a == b,
|
||||
AnimatedProperty::Color(ref a, ref b) => a == b,
|
||||
AnimatedProperty::FontWeight(ref a, ref b) => a == b,
|
||||
AnimatedProperty::Opacity(ref a, ref b) => a == b,
|
||||
AnimatedProperty::OutlineWidth(ref a, ref b) => a == b,
|
||||
AnimatedProperty::TextShadow(ref a, ref b) => a == b,
|
||||
AnimatedProperty::VerticalAlign(ref a, ref b) => a == b,
|
||||
AnimatedProperty::Visibility(ref a, ref b) => a == b,
|
||||
AnimatedProperty::WordSpacing(ref a, ref b) => a == b,
|
||||
AnimatedProperty::ZIndex(ref a, ref b) => a == b,
|
||||
AnimatedProperty::Transform(ref a, ref b) => a == b,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A trait used to implement [interpolation][interpolated-types].
|
||||
///
|
||||
/// [interpolated-types]: https://drafts.csswg.org/css-transitions/#interpolated-types
|
||||
trait Interpolate: Sized {
|
||||
fn interpolate(&self, other: &Self, time: f64) -> Option<Self>;
|
||||
}
|
||||
|
||||
impl Interpolate for Au {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &Au, time: f64) -> Option<Au> {
|
||||
Some(Au((self.0 as f64 + (other.0 as f64 - self.0 as f64) * time).round() as i32))
|
||||
}
|
||||
}
|
||||
|
||||
impl <T> Interpolate for Option<T> where T: Interpolate {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &Option<T>, time: f64) -> Option<Option<T>> {
|
||||
match (self, other) {
|
||||
(&Some(ref this), &Some(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(Some(value))
|
||||
})
|
||||
}
|
||||
(_, _) => None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-number
|
||||
impl Interpolate for f32 {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &f32, time: f64) -> Option<f32> {
|
||||
Some(((*self as f64) + ((*other as f64) - (*self as f64)) * time) as f32)
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-number
|
||||
impl Interpolate for f64 {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &f64, time: f64) -> Option<f64> {
|
||||
Some(*self + (*other - *self) * time)
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-integer
|
||||
impl Interpolate for i32 {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &i32, time: f64) -> Option<i32> {
|
||||
let a = *self as f64;
|
||||
let b = *other as f64;
|
||||
Some((a + (b - a) * time).round() as i32)
|
||||
}
|
||||
}
|
||||
|
||||
impl Interpolate for Angle {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &Angle, time: f64) -> Option<Angle> {
|
||||
self.radians().interpolate(&other.radians(), time).map(Angle)
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-visibility
|
||||
impl Interpolate for Visibility {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &Visibility, time: f64)
|
||||
-> Option<Visibility> {
|
||||
match (*self, *other) {
|
||||
(Visibility::visible, _) | (_, Visibility::visible) => {
|
||||
if time >= 0.0 && time <= 1.0 {
|
||||
Some(Visibility::visible)
|
||||
} else if time < 0.0 {
|
||||
Some(*self)
|
||||
} else {
|
||||
Some(*other)
|
||||
}
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-integer
|
||||
impl Interpolate for ZIndex {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &ZIndex, time: f64)
|
||||
-> Option<ZIndex> {
|
||||
match (*self, *other) {
|
||||
(ZIndex::Number(ref this),
|
||||
ZIndex::Number(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(ZIndex::Number(value))
|
||||
})
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-length
|
||||
impl Interpolate for VerticalAlign {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &VerticalAlign, time: f64)
|
||||
-> Option<VerticalAlign> {
|
||||
match (*self, *other) {
|
||||
(VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(ref this)),
|
||||
VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(ref other))) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(VerticalAlign::LengthOrPercentage(LengthOrPercentage::Length(value)))
|
||||
})
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-simple-list
|
||||
impl Interpolate for BorderSpacing {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &BorderSpacing, time: f64)
|
||||
-> Option<BorderSpacing> {
|
||||
self.horizontal.interpolate(&other.horizontal, time).and_then(|horizontal| {
|
||||
self.vertical.interpolate(&other.vertical, time).and_then(|vertical| {
|
||||
Some(BorderSpacing { horizontal: horizontal, vertical: vertical })
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-color
|
||||
impl Interpolate for RGBA {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &RGBA, time: f64) -> Option<RGBA> {
|
||||
match (self.red.interpolate(&other.red, time),
|
||||
self.green.interpolate(&other.green, time),
|
||||
self.blue.interpolate(&other.blue, time),
|
||||
self.alpha.interpolate(&other.alpha, time)) {
|
||||
(Some(red), Some(green), Some(blue), Some(alpha)) => {
|
||||
Some(RGBA { red: red, green: green, blue: blue, alpha: alpha })
|
||||
}
|
||||
(_, _, _, _) => None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-color
|
||||
impl Interpolate for Color {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &Color, time: f64) -> Option<Color> {
|
||||
match (*self, *other) {
|
||||
(Color::RGBA(ref this), Color::RGBA(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(Color::RGBA(value))
|
||||
})
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
|
||||
impl Interpolate for CalcLengthOrPercentage {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &CalcLengthOrPercentage, time: f64)
|
||||
-> Option<CalcLengthOrPercentage> {
|
||||
Some(CalcLengthOrPercentage {
|
||||
length: self.length().interpolate(&other.length(), time),
|
||||
percentage: self.percentage().interpolate(&other.percentage(), time),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
|
||||
impl Interpolate for LengthOrPercentage {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &LengthOrPercentage, time: f64)
|
||||
-> Option<LengthOrPercentage> {
|
||||
match (*self, *other) {
|
||||
(LengthOrPercentage::Length(ref this),
|
||||
LengthOrPercentage::Length(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentage::Length(value))
|
||||
})
|
||||
}
|
||||
(LengthOrPercentage::Percentage(ref this),
|
||||
LengthOrPercentage::Percentage(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentage::Percentage(value))
|
||||
})
|
||||
}
|
||||
(this, other) => {
|
||||
let this: CalcLengthOrPercentage = From::from(this);
|
||||
let other: CalcLengthOrPercentage = From::from(other);
|
||||
this.interpolate(&other, time).and_then(|value| {
|
||||
Some(LengthOrPercentage::Calc(value))
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
|
||||
impl Interpolate for LengthOrPercentageOrAuto {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &LengthOrPercentageOrAuto, time: f64)
|
||||
-> Option<LengthOrPercentageOrAuto> {
|
||||
match (*self, *other) {
|
||||
(LengthOrPercentageOrAuto::Length(ref this),
|
||||
LengthOrPercentageOrAuto::Length(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentageOrAuto::Length(value))
|
||||
})
|
||||
}
|
||||
(LengthOrPercentageOrAuto::Percentage(ref this),
|
||||
LengthOrPercentageOrAuto::Percentage(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentageOrAuto::Percentage(value))
|
||||
})
|
||||
}
|
||||
(LengthOrPercentageOrAuto::Auto, LengthOrPercentageOrAuto::Auto) => {
|
||||
Some(LengthOrPercentageOrAuto::Auto)
|
||||
}
|
||||
(this, other) => {
|
||||
let this: Option<CalcLengthOrPercentage> = From::from(this);
|
||||
let other: Option<CalcLengthOrPercentage> = From::from(other);
|
||||
this.interpolate(&other, time).unwrap_or(None).and_then(|value| {
|
||||
Some(LengthOrPercentageOrAuto::Calc(value))
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-lpcalc
|
||||
impl Interpolate for LengthOrPercentageOrNone {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &LengthOrPercentageOrNone, time: f64)
|
||||
-> Option<LengthOrPercentageOrNone> {
|
||||
match (*self, *other) {
|
||||
(LengthOrPercentageOrNone::Length(ref this),
|
||||
LengthOrPercentageOrNone::Length(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentageOrNone::Length(value))
|
||||
})
|
||||
}
|
||||
(LengthOrPercentageOrNone::Percentage(ref this),
|
||||
LengthOrPercentageOrNone::Percentage(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LengthOrPercentageOrNone::Percentage(value))
|
||||
})
|
||||
}
|
||||
(LengthOrPercentageOrNone::None, LengthOrPercentageOrNone::None) => {
|
||||
Some(LengthOrPercentageOrNone::None)
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-number
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-length
|
||||
impl Interpolate for LineHeight {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &LineHeight, time: f64)
|
||||
-> Option<LineHeight> {
|
||||
match (*self, *other) {
|
||||
(LineHeight::Length(ref this),
|
||||
LineHeight::Length(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LineHeight::Length(value))
|
||||
})
|
||||
}
|
||||
(LineHeight::Number(ref this),
|
||||
LineHeight::Number(ref other)) => {
|
||||
this.interpolate(other, time).and_then(|value| {
|
||||
Some(LineHeight::Number(value))
|
||||
})
|
||||
}
|
||||
(LineHeight::Normal, LineHeight::Normal) => {
|
||||
Some(LineHeight::Normal)
|
||||
}
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-font-weight
|
||||
impl Interpolate for FontWeight {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &FontWeight, time: f64)
|
||||
-> Option<FontWeight> {
|
||||
let a = (*self as u32) as f64;
|
||||
let b = (*other as u32) as f64;
|
||||
let weight = a + (b - a) * time;
|
||||
Some(if weight < 150. {
|
||||
FontWeight::Weight100
|
||||
} else if weight < 250. {
|
||||
FontWeight::Weight200
|
||||
} else if weight < 350. {
|
||||
FontWeight::Weight300
|
||||
} else if weight < 450. {
|
||||
FontWeight::Weight400
|
||||
} else if weight < 550. {
|
||||
FontWeight::Weight500
|
||||
} else if weight < 650. {
|
||||
FontWeight::Weight600
|
||||
} else if weight < 750. {
|
||||
FontWeight::Weight700
|
||||
} else if weight < 850. {
|
||||
FontWeight::Weight800
|
||||
} else {
|
||||
FontWeight::Weight900
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-rect
|
||||
impl Interpolate for ClipRect {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &ClipRect, time: f64)
|
||||
-> Option<ClipRect> {
|
||||
match (self.top.interpolate(&other.top, time),
|
||||
self.right.interpolate(&other.right, time),
|
||||
self.bottom.interpolate(&other.bottom, time),
|
||||
self.left.interpolate(&other.left, time)) {
|
||||
(Some(top), Some(right), Some(bottom), Some(left)) => {
|
||||
Some(ClipRect { top: top, right: right, bottom: bottom, left: left })
|
||||
},
|
||||
(_, _, _, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-simple-list
|
||||
impl Interpolate for BackgroundPosition {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &BackgroundPosition, time: f64)
|
||||
-> Option<BackgroundPosition> {
|
||||
match (self.horizontal.interpolate(&other.horizontal, time),
|
||||
self.vertical.interpolate(&other.vertical, time)) {
|
||||
(Some(horizontal), Some(vertical)) => {
|
||||
Some(BackgroundPosition { horizontal: horizontal, vertical: vertical })
|
||||
},
|
||||
(_, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
|
||||
impl Interpolate for TextShadow {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &TextShadow, time: f64)
|
||||
-> Option<TextShadow> {
|
||||
match (self.offset_x.interpolate(&other.offset_x, time),
|
||||
self.offset_y.interpolate(&other.offset_y, time),
|
||||
self.blur_radius.interpolate(&other.blur_radius, time),
|
||||
self.color.interpolate(&other.color, time)) {
|
||||
(Some(offset_x), Some(offset_y), Some(blur_radius), Some(color)) => {
|
||||
Some(TextShadow { offset_x: offset_x, offset_y: offset_y, blur_radius: blur_radius, color: color })
|
||||
},
|
||||
(_, _, _, _) => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transitions/#animtype-shadow-list
|
||||
impl Interpolate for TextShadowList {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &TextShadowList, time: f64)
|
||||
-> Option<TextShadowList> {
|
||||
let zero = TextShadow {
|
||||
offset_x: Au(0),
|
||||
offset_y: Au(0),
|
||||
blur_radius: Au(0),
|
||||
color: Color::RGBA(RGBA {
|
||||
red: 0.0, green: 0.0, blue: 0.0, alpha: 0.0
|
||||
})
|
||||
};
|
||||
|
||||
let interpolate_each = |(a, b): (&TextShadow, &TextShadow)| {
|
||||
a.interpolate(b, time).unwrap()
|
||||
};
|
||||
|
||||
Some(TextShadowList(match self.0.len().cmp(&other.0.len()) {
|
||||
Ordering::Less => other.0.iter().chain(repeat(&zero)).zip(other.0.iter()).map(interpolate_each).collect(),
|
||||
_ => self.0.iter().zip(other.0.iter().chain(repeat(&zero))).map(interpolate_each).collect(),
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if it's possible to do a direct numerical interpolation
|
||||
/// between these two transform lists.
|
||||
/// http://dev.w3.org/csswg/css-transforms/#transform-transform-animation
|
||||
fn can_interpolate_list(from_list: &[TransformOperation],
|
||||
to_list: &[TransformOperation]) -> bool {
|
||||
// Lists must be equal length
|
||||
if from_list.len() != to_list.len() {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Each transform operation must match primitive type in other list
|
||||
for (from, to) in from_list.iter().zip(to_list) {
|
||||
match (from, to) {
|
||||
(&TransformOperation::Matrix(..), &TransformOperation::Matrix(..)) |
|
||||
(&TransformOperation::Skew(..), &TransformOperation::Skew(..)) |
|
||||
(&TransformOperation::Translate(..), &TransformOperation::Translate(..)) |
|
||||
(&TransformOperation::Scale(..), &TransformOperation::Scale(..)) |
|
||||
(&TransformOperation::Rotate(..), &TransformOperation::Rotate(..)) |
|
||||
(&TransformOperation::Perspective(..), &TransformOperation::Perspective(..)) => {}
|
||||
_ => {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
}
|
||||
|
||||
/// Interpolate two transform lists.
|
||||
/// https://drafts.csswg.org/css-transforms/#interpolation-of-transforms
|
||||
fn interpolate_transform_list(from_list: &[TransformOperation],
|
||||
to_list: &[TransformOperation],
|
||||
time: f64) -> TransformList {
|
||||
let mut result = vec![];
|
||||
|
||||
if can_interpolate_list(from_list, to_list) {
|
||||
for (from, to) in from_list.iter().zip(to_list) {
|
||||
match (from, to) {
|
||||
(&TransformOperation::Matrix(from),
|
||||
&TransformOperation::Matrix(_to)) => {
|
||||
// TODO(gw): Implement matrix decomposition and interpolation
|
||||
result.push(TransformOperation::Matrix(from));
|
||||
}
|
||||
(&TransformOperation::Skew(fx, fy),
|
||||
&TransformOperation::Skew(tx, ty)) => {
|
||||
let ix = fx.interpolate(&tx, time).unwrap();
|
||||
let iy = fy.interpolate(&ty, time).unwrap();
|
||||
result.push(TransformOperation::Skew(ix, iy));
|
||||
}
|
||||
(&TransformOperation::Translate(fx, fy, fz),
|
||||
&TransformOperation::Translate(tx, ty, tz)) => {
|
||||
let ix = fx.interpolate(&tx, time).unwrap();
|
||||
let iy = fy.interpolate(&ty, time).unwrap();
|
||||
let iz = fz.interpolate(&tz, time).unwrap();
|
||||
result.push(TransformOperation::Translate(ix, iy, iz));
|
||||
}
|
||||
(&TransformOperation::Scale(fx, fy, fz),
|
||||
&TransformOperation::Scale(tx, ty, tz)) => {
|
||||
let ix = fx.interpolate(&tx, time).unwrap();
|
||||
let iy = fy.interpolate(&ty, time).unwrap();
|
||||
let iz = fz.interpolate(&tz, time).unwrap();
|
||||
result.push(TransformOperation::Scale(ix, iy, iz));
|
||||
}
|
||||
(&TransformOperation::Rotate(fx, fy, fz, fa),
|
||||
&TransformOperation::Rotate(_tx, _ty, _tz, _ta)) => {
|
||||
// TODO(gw): Implement matrix decomposition and interpolation
|
||||
result.push(TransformOperation::Rotate(fx, fy, fz, fa));
|
||||
}
|
||||
(&TransformOperation::Perspective(fd),
|
||||
&TransformOperation::Perspective(_td)) => {
|
||||
// TODO(gw): Implement matrix decomposition and interpolation
|
||||
result.push(TransformOperation::Perspective(fd));
|
||||
}
|
||||
_ => {
|
||||
// This should be unreachable due to the can_interpolate_list() call.
|
||||
unreachable!();
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// TODO(gw): Implement matrix decomposition and interpolation
|
||||
result.extend_from_slice(from_list);
|
||||
}
|
||||
|
||||
TransformList(Some(result))
|
||||
}
|
||||
|
||||
/// Build an equivalent 'identity transform function list' based
|
||||
/// on an existing transform list.
|
||||
/// https://drafts.csswg.org/css-transforms/#none-transform-animation
|
||||
fn build_identity_transform_list(list: &[TransformOperation]) -> Vec<TransformOperation> {
|
||||
let mut result = vec!();
|
||||
|
||||
for operation in list {
|
||||
match *operation {
|
||||
TransformOperation::Matrix(..) => {
|
||||
let identity = ComputedMatrix::identity();
|
||||
result.push(TransformOperation::Matrix(identity));
|
||||
}
|
||||
TransformOperation::Skew(..) => {
|
||||
result.push(TransformOperation::Skew(Angle(0.0), Angle(0.0)));
|
||||
}
|
||||
TransformOperation::Translate(..) => {
|
||||
result.push(TransformOperation::Translate(LengthOrPercentage::zero(),
|
||||
LengthOrPercentage::zero(),
|
||||
Au(0)));
|
||||
}
|
||||
TransformOperation::Scale(..) => {
|
||||
result.push(TransformOperation::Scale(1.0, 1.0, 1.0));
|
||||
}
|
||||
TransformOperation::Rotate(..) => {
|
||||
result.push(TransformOperation::Rotate(0.0, 0.0, 1.0, Angle(0.0)));
|
||||
}
|
||||
TransformOperation::Perspective(..) => {
|
||||
// http://dev.w3.org/csswg/css-transforms/#identity-transform-function
|
||||
let identity = ComputedMatrix::identity();
|
||||
result.push(TransformOperation::Matrix(identity));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
/// https://drafts.csswg.org/css-transforms/#interpolation-of-transforms
|
||||
impl Interpolate for TransformList {
|
||||
#[inline]
|
||||
fn interpolate(&self, other: &TransformList, time: f64) -> Option<TransformList> {
|
||||
let result = match (&self.0, &other.0) {
|
||||
(&Some(ref from_list), &Some(ref to_list)) => {
|
||||
// https://drafts.csswg.org/css-transforms/#transform-transform-animation
|
||||
interpolate_transform_list(from_list, &to_list, time)
|
||||
}
|
||||
(&Some(ref from_list), &None) => {
|
||||
// https://drafts.csswg.org/css-transforms/#none-transform-animation
|
||||
let to_list = build_identity_transform_list(from_list);
|
||||
interpolate_transform_list(from_list, &to_list, time)
|
||||
}
|
||||
(&None, &Some(ref to_list)) => {
|
||||
// https://drafts.csswg.org/css-transforms/#none-transform-animation
|
||||
let from_list = build_identity_transform_list(to_list);
|
||||
interpolate_transform_list(&from_list, to_list, time)
|
||||
}
|
||||
_ => {
|
||||
// https://drafts.csswg.org/css-transforms/#none-none-animation
|
||||
TransformList(None)
|
||||
}
|
||||
};
|
||||
|
||||
Some(result)
|
||||
fn does_animate(&self) -> bool {
|
||||
self.property.does_animate() && self.duration != Time(0.0)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -948,6 +147,7 @@ pub trait GetMod {
|
|||
|
||||
impl<T> GetMod for Vec<T> {
|
||||
type Item = T;
|
||||
#[inline]
|
||||
fn get_mod(&self, i: usize) -> &T {
|
||||
&(*self)[i % self.len()]
|
||||
}
|
||||
|
|
@ -991,10 +191,9 @@ pub fn start_transitions_if_applicable<C: ComputedValues>(new_animations_sender:
|
|||
|
||||
/// Updates a single animation and associated style based on the current time. If `damage` is
|
||||
/// provided, inserts the appropriate restyle damage.
|
||||
pub fn update_style_for_animation<C: ComputedValues,
|
||||
Damage: TRestyleDamage<ConcreteComputedValues=C>>(animation: &Animation,
|
||||
style: &mut Arc<C>,
|
||||
damage: Option<&mut Damage>) {
|
||||
pub fn update_style_for_animation<Damage: TRestyleDamage>(animation: &Animation,
|
||||
style: &mut Arc<Damage::ConcreteComputedValues>,
|
||||
damage: Option<&mut Damage>) {
|
||||
let now = time::precise_time_s();
|
||||
let mut progress = (now - animation.start_time) / animation.duration();
|
||||
if progress > 1.0 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue