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

Disallow negative duration for animation and transition.

Browse source
This commit is contained in:
Hiroyuki Ikezoe 2017-05-12 15:35:41 +09:00
parent d1f2cdfb3d
commit 130a08f0b5
4 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/style/values/specified/mod.rs
View file

@ -539,6 +539,28 @@ impl Time {
was_calc: true,
}
}
fn parse_with_clamping_mode(context: &ParserContext,
input: &mut Parser,
clamping_mode: AllowedNumericType) -> Result<Self, ()> {
match input.next() {
Ok(Token::Dimension(ref value, ref unit)) if clamping_mode.is_ok(value.value) => {
Time::parse_dimension(value.value, &unit, /* from_calc = */ false)
}
Ok(Token::Function(ref name)) if name.eq_ignore_ascii_case("calc") => {
match input.parse_nested_block(|i| CalcNode::parse_time(context, i)) {
Ok(time) if clamping_mode.is_ok(time.seconds) => Ok(time),
_ => Err(()),
}
}
_ => Err(())
}
}
/// Parse <time> that values are non-negative.
pub fn parse_non_negative(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
Self::parse_with_clamping_mode(context, input, AllowedNumericType::NonNegative)
}
}
impl ToComputedValue for Time {
@ -558,15 +580,7 @@ impl ToComputedValue for Time {
impl Parse for Time {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
match input.next() {
Ok(Token::Dimension(ref value, ref unit)) => {
Time::parse_dimension(value.value, &unit, /* from_calc = */ false)
}
Ok(Token::Function(ref name)) if name.eq_ignore_ascii_case("calc") => {
input.parse_nested_block(|i| CalcNode::parse_time(context, i))
}
_ => Err(())
}
Self::parse_with_clamping_mode(context, input, AllowedNumericType::All)
}
}