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

Convert transition-timing-function longhand into vector_longhand

Browse source
This commit is contained in:
Nazım Can Altınova 2017-01-07 21:29:43 +03:00
parent 77368ac48c
commit 8e21d65303
4 changed files with 72 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/animation.rs
View file

@ -16,8 +16,8 @@ use properties::animated_properties::{AnimatedProperty, TransitionProperty};
use properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection; use properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection;
use properties::longhands::animation_iteration_count::computed_value::AnimationIterationCount; use properties::longhands::animation_iteration_count::computed_value::AnimationIterationCount;
use properties::longhands::animation_play_state::computed_value::single_value::T as AnimationPlayState; use properties::longhands::animation_play_state::computed_value::single_value::T as AnimationPlayState;
use properties::longhands::transition_timing_function::computed_value::StartEnd; use properties::longhands::transition_timing_function::single_value::computed_value::StartEnd;
use properties::longhands::transition_timing_function::computed_value::TransitionTimingFunction; use properties::longhands::transition_timing_function::single_value::computed_value::T as TransitionTimingFunction;
use std::sync::Arc; use std::sync::Arc;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use timer::Timer; use timer::Timer;

187
components/style/properties/longhand/box.mako.rs
View file

@ -459,55 +459,52 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
</%helpers:vector_longhand> </%helpers:vector_longhand>
// TODO(pcwalton): Lots more timing functions. // TODO(pcwalton): Lots more timing functions.
<%helpers:longhand name="transition-timing-function" <%helpers:vector_longhand name="transition-timing-function"
need_index="True" need_index="True"
animatable="False" animatable="False"
spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function"> spec="https://drafts.csswg.org/css-transitions/#propdef-transition-timing-function">
use self::computed_value::StartEnd; use self::computed_value::StartEnd;
use self::computed_value::TransitionTimingFunction as ComputedTransitionTimingFunction;
use euclid::point::{Point2D, TypedPoint2D}; use euclid::point::{Point2D, TypedPoint2D};
use std::fmt; use std::fmt;
use std::marker::PhantomData; use std::marker::PhantomData;
use style_traits::ToCss; use style_traits::ToCss;
pub use self::TransitionTimingFunction as SingleSpecifiedValue;
// FIXME: This could use static variables and const functions when they are available. // FIXME: This could use static variables and const functions when they are available.
#[inline(always)] #[inline(always)]
fn ease() -> ComputedTransitionTimingFunction { fn ease() -> computed_value::T {
ComputedTransitionTimingFunction::CubicBezier(TypedPoint2D::new(0.25, 0.1), computed_value::T::CubicBezier(TypedPoint2D::new(0.25, 0.1),
TypedPoint2D::new(0.25, 1.0)) TypedPoint2D::new(0.25, 1.0))
} }
#[inline(always)] #[inline(always)]
fn linear() -> ComputedTransitionTimingFunction { fn linear() -> computed_value::T {
ComputedTransitionTimingFunction::CubicBezier(TypedPoint2D::new(0.0, 0.0), computed_value::T::CubicBezier(TypedPoint2D::new(0.0, 0.0),
TypedPoint2D::new(1.0, 1.0)) TypedPoint2D::new(1.0, 1.0))
} }
#[inline(always)] #[inline(always)]
fn ease_in() -> ComputedTransitionTimingFunction { fn ease_in() -> computed_value::T {
ComputedTransitionTimingFunction::CubicBezier(TypedPoint2D::new(0.42, 0.0), computed_value::T::CubicBezier(TypedPoint2D::new(0.42, 0.0),
TypedPoint2D::new(1.0, 1.0)) TypedPoint2D::new(1.0, 1.0))
} }
#[inline(always)] #[inline(always)]
fn ease_out() -> ComputedTransitionTimingFunction { fn ease_out() -> computed_value::T {
ComputedTransitionTimingFunction::CubicBezier(TypedPoint2D::new(0.0, 0.0), computed_value::T::CubicBezier(TypedPoint2D::new(0.0, 0.0),
TypedPoint2D::new(0.58, 1.0)) TypedPoint2D::new(0.58, 1.0))
} }
#[inline(always)] #[inline(always)]
fn ease_in_out() -> ComputedTransitionTimingFunction { fn ease_in_out() -> computed_value::T {
ComputedTransitionTimingFunction::CubicBezier(TypedPoint2D::new(0.42, 0.0), computed_value::T::CubicBezier(TypedPoint2D::new(0.42, 0.0),
TypedPoint2D::new(0.58, 1.0)) TypedPoint2D::new(0.58, 1.0))
} }
static STEP_START: ComputedTransitionTimingFunction = static STEP_START: computed_value::T =
ComputedTransitionTimingFunction::Steps(1, StartEnd::Start); computed_value::T::Steps(1, StartEnd::Start);
static STEP_END: ComputedTransitionTimingFunction = static STEP_END: computed_value::T =
ComputedTransitionTimingFunction::Steps(1, StartEnd::End); computed_value::T::Steps(1, StartEnd::End);
pub mod computed_value { pub mod computed_value {
use euclid::point::Point2D; use euclid::point::Point2D;
@ -515,20 +512,19 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
use std::fmt; use std::fmt;
use style_traits::ToCss; use style_traits::ToCss;
pub use self::TransitionTimingFunction as SingleComputedValue;
pub use super::parse; pub use super::parse;
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum TransitionTimingFunction { pub enum T {
CubicBezier(Point2D<f32>, Point2D<f32>), CubicBezier(Point2D<f32>, Point2D<f32>),
Steps(u32, StartEnd), Steps(u32, StartEnd),
} }
impl ToCss for TransitionTimingFunction { impl ToCss for T {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
TransitionTimingFunction::CubicBezier(p1, p2) => { T::CubicBezier(p1, p2) => {
try!(dest.write_str("cubic-bezier(")); try!(dest.write_str("cubic-bezier("));
try!(p1.x.to_css(dest)); try!(p1.x.to_css(dest));
try!(dest.write_str(", ")); try!(dest.write_str(", "));
@ -539,7 +535,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
try!(p2.y.to_css(dest)); try!(p2.y.to_css(dest));
dest.write_str(")") dest.write_str(")")
} }
TransitionTimingFunction::Steps(steps, start_end) => { T::Steps(steps, start_end) => {
super::serialize_steps(dest, steps, start_end) super::serialize_steps(dest, steps, start_end)
} }
} }
@ -561,25 +557,6 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
} }
} }
} }
#[derive(Clone, Debug, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct T(pub Vec<TransitionTimingFunction>);
impl ToCss for T {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
if self.0.is_empty() {
return dest.write_str("none")
}
for (i, value) in self.0.iter().enumerate() {
if i != 0 {
try!(dest.write_str(", "))
}
try!(value.to_css(dest))
}
Ok(())
}
}
} }
define_css_keyword_enum!(FunctionKeyword: define_css_keyword_enum!(FunctionKeyword:
@ -593,17 +570,13 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
#[derive(Copy, Clone, Debug, PartialEq)] #[derive(Copy, Clone, Debug, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum TransitionTimingFunction { pub enum SpecifiedValue {
CubicBezier(Point2D<f32>, Point2D<f32>), CubicBezier(Point2D<f32>, Point2D<f32>),
Steps(u32, StartEnd), Steps(u32, StartEnd),
Keyword(FunctionKeyword), Keyword(FunctionKeyword),
} }
#[derive(Clone, Debug, PartialEq)] impl Parse for SpecifiedValue {
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct SpecifiedValue(pub Vec<TransitionTimingFunction>);
impl Parse for TransitionTimingFunction {
fn parse(_context: &ParserContext, input: &mut ::cssparser::Parser) -> Result<Self, ()> { fn parse(_context: &ParserContext, input: &mut ::cssparser::Parser) -> Result<Self, ()> {
if let Ok(function_name) = input.try(|input| input.expect_function()) { if let Ok(function_name) = input.try(|input| input.expect_function()) {
return match_ignore_ascii_case! { function_name, return match_ignore_ascii_case! { function_name,
@ -620,7 +593,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
Ok(()) Ok(())
})); }));
let (p1, p2) = (Point2D::new(p1x, p1y), Point2D::new(p2x, p2y)); let (p1, p2) = (Point2D::new(p1x, p1y), Point2D::new(p2x, p2y));
Ok(TransitionTimingFunction::CubicBezier(p1, p2)) Ok(SpecifiedValue::CubicBezier(p1, p2))
}, },
"steps" => { "steps" => {
let (mut step_count, mut start_end) = (0, StartEnd::End); let (mut step_count, mut start_end) = (0, StartEnd::End);
@ -636,12 +609,12 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
} }
Ok(()) Ok(())
})); }));
Ok(TransitionTimingFunction::Steps(step_count as u32, start_end)) Ok(SpecifiedValue::Steps(step_count as u32, start_end))
}, },
_ => Err(()) _ => Err(())
} }
} }
Ok(TransitionTimingFunction::Keyword(try!(FunctionKeyword::parse(input)))) Ok(SpecifiedValue::Keyword(try!(FunctionKeyword::parse(input))))
} }
} }
@ -656,10 +629,10 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
} }
// https://drafts.csswg.org/css-transitions/#serializing-a-timing-function // https://drafts.csswg.org/css-transitions/#serializing-a-timing-function
impl ToCss for TransitionTimingFunction { impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
TransitionTimingFunction::CubicBezier(p1, p2) => { SpecifiedValue::CubicBezier(p1, p2) => {
try!(dest.write_str("cubic-bezier(")); try!(dest.write_str("cubic-bezier("));
try!(p1.x.to_css(dest)); try!(p1.x.to_css(dest));
try!(dest.write_str(", ")); try!(dest.write_str(", "));
@ -670,10 +643,10 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
try!(p2.y.to_css(dest)); try!(p2.y.to_css(dest));
dest.write_str(")") dest.write_str(")")
}, },
TransitionTimingFunction::Steps(steps, start_end) => { SpecifiedValue::Steps(steps, start_end) => {
serialize_steps(dest, steps, start_end) serialize_steps(dest, steps, start_end)
}, },
TransitionTimingFunction::Keyword(keyword) => { SpecifiedValue::Keyword(keyword) => {
match keyword { match keyword {
FunctionKeyword::StepStart => { FunctionKeyword::StepStart => {
serialize_steps(dest, 1, StartEnd::Start) serialize_steps(dest, 1, StartEnd::Start)
@ -690,19 +663,19 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
} }
} }
impl ToComputedValue for TransitionTimingFunction { impl ToComputedValue for SpecifiedValue {
type ComputedValue = ComputedTransitionTimingFunction; type ComputedValue = computed_value::T;
#[inline] #[inline]
fn to_computed_value(&self, _context: &Context) -> ComputedTransitionTimingFunction { fn to_computed_value(&self, _context: &Context) -> computed_value::T {
match *self { match *self {
TransitionTimingFunction::CubicBezier(p1, p2) => { SpecifiedValue::CubicBezier(p1, p2) => {
ComputedTransitionTimingFunction::CubicBezier(p1, p2) computed_value::T::CubicBezier(p1, p2)
}, },
TransitionTimingFunction::Steps(count, start_end) => { SpecifiedValue::Steps(count, start_end) => {
ComputedTransitionTimingFunction::Steps(count, start_end) computed_value::T::Steps(count, start_end)
}, },
TransitionTimingFunction::Keyword(keyword) => { SpecifiedValue::Keyword(keyword) => {
match keyword { match keyword {
FunctionKeyword::Ease => ease(), FunctionKeyword::Ease => ease(),
FunctionKeyword::Linear => linear(), FunctionKeyword::Linear => linear(),
@ -716,44 +689,15 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
} }
} }
#[inline] #[inline]
fn from_computed_value(computed: &ComputedTransitionTimingFunction) -> Self {
match *computed {
computed_value::TransitionTimingFunction::CubicBezier(p1, p2) => {
TransitionTimingFunction::CubicBezier(p1, p2)
},
computed_value::TransitionTimingFunction::Steps(count, start_end) => {
TransitionTimingFunction::Steps(count, start_end)
},
}
}
}
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
if self.0.is_empty() {
return dest.write_str("none")
}
for (i, value) in self.0.iter().enumerate() {
if i != 0 {
try!(dest.write_str(", "))
}
try!(value.to_css(dest))
}
Ok(())
}
}
impl ToComputedValue for SpecifiedValue {
type ComputedValue = computed_value::T;
#[inline]
fn to_computed_value(&self, context: &Context) -> computed_value::T {
computed_value::T(self.0.iter().map(|f| f.to_computed_value(context)).collect())
}
#[inline]
fn from_computed_value(computed: &computed_value::T) -> Self { fn from_computed_value(computed: &computed_value::T) -> Self {
SpecifiedValue(computed.0.iter().map(|f| ToComputedValue::from_computed_value(f)) match *computed {
.collect()) computed_value::T::CubicBezier(p1, p2) => {
SpecifiedValue::CubicBezier(p1, p2)
},
computed_value::T::Steps(count, start_end) => {
SpecifiedValue::Steps(count, start_end)
},
}
} }
} }
@ -761,26 +705,19 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
impl NoViewportPercentage for SpecifiedValue {} impl NoViewportPercentage for SpecifiedValue {}
#[inline] #[inline]
pub fn get_initial_single_value() -> ComputedTransitionTimingFunction { pub fn get_initial_value() -> computed_value::T {
ease() ease()
} }
#[inline] #[inline]
pub fn get_initial_specified_single_value() -> TransitionTimingFunction { pub fn get_initial_specified_value() -> SpecifiedValue {
ToComputedValue::from_computed_value(&ease()) ToComputedValue::from_computed_value(&ease())
} }
#[inline]
pub fn get_initial_value() -> computed_value::T {
computed_value::T(vec![get_initial_single_value()])
}
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> { pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
Ok(SpecifiedValue(try!(input.parse_comma_separated(|i| { SpecifiedValue::parse(context, input)
TransitionTimingFunction::parse(context, i)
}))))
} }
</%helpers:longhand> </%helpers:vector_longhand>
<%helpers:longhand name="transition-property" <%helpers:longhand name="transition-property"
need_index="True" need_index="True"
@ -931,17 +868,17 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
pub use properties::longhands::transition_duration::single_value::SpecifiedValue; pub use properties::longhands::transition_duration::single_value::SpecifiedValue;
</%helpers:vector_longhand> </%helpers:vector_longhand>
<%helpers:longhand name="animation-timing-function" <%helpers:vector_longhand name="animation-timing-function"
need_index="True" need_index="True"
animatable="False", animatable="False",
spec="https://drafts.csswg.org/css-animations/#propdef-animation-timing-function", spec="https://drafts.csswg.org/css-animations/#propdef-animation-timing-function",
allowed_in_keyframe_block="False"> allowed_in_keyframe_block="False">
pub use super::transition_timing_function::computed_value; pub use properties::longhands::transition_timing_function::single_value::computed_value;
pub use super::transition_timing_function::{get_initial_value, get_initial_single_value}; pub use properties::longhands::transition_timing_function::single_value::get_initial_value;
pub use super::transition_timing_function::{get_initial_specified_single_value, parse}; pub use properties::longhands::transition_timing_function::single_value::get_initial_specified_value;
pub use super::transition_timing_function::SpecifiedValue; pub use properties::longhands::transition_timing_function::single_value::parse;
pub use super::transition_timing_function::SingleSpecifiedValue; pub use properties::longhands::transition_timing_function::single_value::SpecifiedValue;
</%helpers:longhand> </%helpers:vector_longhand>
<%helpers:longhand name="animation-iteration-count" <%helpers:longhand name="animation-iteration-count"
need_index="True" need_index="True"

6
components/style/properties/shorthand/box.mako.rs
View file

@ -129,7 +129,8 @@ macro_rules! try_parse_one {
transition_duration: transition_duration:
duration.unwrap_or_else(transition_duration::single_value::get_initial_value), duration.unwrap_or_else(transition_duration::single_value::get_initial_value),
transition_timing_function: transition_timing_function:
timing_function.unwrap_or_else(transition_timing_function::get_initial_specified_single_value), timing_function.unwrap_or_else(transition_timing_function::single_value
::get_initial_specified_value),
transition_delay: transition_delay:
delay.unwrap_or_else(transition_delay::single_value::get_initial_value), delay.unwrap_or_else(transition_delay::single_value::get_initial_value),
}) })
@ -240,7 +241,8 @@ macro_rules! try_parse_one {
animation_duration: animation_duration:
duration.unwrap_or_else(animation_duration::single_value::get_initial_value), duration.unwrap_or_else(animation_duration::single_value::get_initial_value),
animation_timing_function: animation_timing_function:
timing_function.unwrap_or_else(animation_timing_function::get_initial_specified_single_value), timing_function.unwrap_or_else(animation_timing_function::single_value
::get_initial_specified_value),
animation_delay: animation_delay:
delay.unwrap_or_else(animation_delay::single_value::get_initial_value), delay.unwrap_or_else(animation_delay::single_value::get_initial_value),
animation_iteration_count: animation_iteration_count:

8
tests/unit/style/properties/serialization.rs
View file

@ -539,8 +539,7 @@ mod shorthand_serialization {
use style::properties::longhands::transition_delay::SpecifiedValue as DelayContainer; use style::properties::longhands::transition_delay::SpecifiedValue as DelayContainer;
use style::properties::longhands::transition_duration::SpecifiedValue as DurationContainer; use style::properties::longhands::transition_duration::SpecifiedValue as DurationContainer;
use style::properties::longhands::transition_property::SpecifiedValue as PropertyContainer; use style::properties::longhands::transition_property::SpecifiedValue as PropertyContainer;
use style::properties::longhands::transition_timing_function::SpecifiedValue as TimingContainer; use style::properties::longhands::transition_timing_function;
use style::properties::longhands::transition_timing_function::TransitionTimingFunction;
use style::values::specified::Time as TimeContainer; use style::values::specified::Time as TimeContainer;
let property_name = DeclaredValue::Value( let property_name = DeclaredValue::Value(
@ -556,8 +555,9 @@ mod shorthand_serialization {
); );
let timing_function = DeclaredValue::Value( let timing_function = DeclaredValue::Value(
TimingContainer(vec![ transition_timing_function::SpecifiedValue(vec![
TransitionTimingFunction::CubicBezier(Point2D::new(0f32, 5f32), Point2D::new(5f32, 10f32)) transition_timing_function::single_value::SpecifiedValue::CubicBezier(
Point2D::new(0f32, 5f32), Point2D::new(5f32, 10f32))
]) ])
); );