Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-23 16:44:33 +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

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

@ -444,7 +444,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
}
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
Time::parse(context, input)
Time::parse_non_negative(context, input)
}
</%helpers:vector_longhand>
@ -824,7 +824,11 @@ ${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::computed_value;
pub use properties::longhands::transition_duration::single_value::{get_initial_value, get_initial_specified_value};
pub use properties::longhands::transition_duration::single_value::parse;
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
use values::specified::Time;
Time::parse(context, input)
}
</%helpers:vector_longhand>
<%helpers:vector_longhand name="animation-name"
@ -1031,10 +1035,10 @@ ${helpers.single_keyword("animation-fill-mode",
extra_prefixes="moz webkit",
spec="https://drafts.csswg.org/css-animations/#propdef-animation-delay",
allowed_in_keyframe_block="False">
pub use properties::longhands::transition_duration::single_value::computed_value;
pub use properties::longhands::transition_duration::single_value::get_initial_specified_value;
pub use properties::longhands::transition_duration::single_value::{get_initial_value, parse};
pub use properties::longhands::transition_duration::single_value::SpecifiedValue;
pub use properties::longhands::transition_delay::single_value::computed_value;
pub use properties::longhands::transition_delay::single_value::get_initial_specified_value;
pub use properties::longhands::transition_delay::single_value::{get_initial_value, parse};
pub use properties::longhands::transition_delay::single_value::SpecifiedValue;
</%helpers:vector_longhand>
<%helpers:longhand products="gecko" name="scroll-snap-points-y" animation_value_type="none"

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)
}
}

8
tests/wpt/metadata-css/css-transitions-1_dev/html/transition-duration-001.htm.ini
View file

@ -1,8 +0,0 @@
[transition-duration-001.htm]
type: testharness
[parse '-5s']
expected: FAIL
[parse '-500ms']
expected: FAIL

8
tests/wpt/metadata-css/css-values-3_dev/html/transition-duration-001.htm.ini
View file

@ -1,8 +0,0 @@
[transition-duration-001.htm]
type: testharness
[parse '-5s']
expected: FAIL
[parse '-500ms']
expected: FAIL