Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-13 16:38:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Auto merge of #15793 - upsuper:animation, r=emilio,bholley"

Browse source 
This reverts commit 7cd4c69c40, reversing
changes made to 1b1fadb8b8.
This commit is contained in:
Bobby Holley 2017-03-03 11:50:15 -08:00
parent c32181c6db
commit 3a56899201
7 changed files with 97 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/style/lib.rs
View file

@ -14,7 +14,7 @@ extern crate parking_lot;
extern crate rayon;
extern crate rustc_serialize;
extern crate selectors;
#[macro_use] extern crate servo_atoms;
extern crate servo_atoms;
extern crate servo_config;
extern crate servo_url;
extern crate style;

16
tests/unit/style/parsing/animation.rs
View file

@ -5,27 +5,11 @@
use cssparser::Parser;
use media_queries::CSSErrorReporterTest;
use parsing::parse;
use servo_atoms::Atom;
use style::parser::{Parse, ParserContext};
use style::properties::longhands::animation_iteration_count::single_value::computed_value::T as AnimationIterationCount;
use style::properties::longhands::animation_name;
use style::stylesheets::Origin;
use style_traits::ToCss;
#[test]
fn test_animation_name() {
use self::animation_name::single_value::SpecifiedValue as SingleValue;
let other_name = Atom::from("other-name");
assert_eq!(parse_longhand!(animation_name, "none"),
animation_name::SpecifiedValue(vec![SingleValue(atom!(""))]));
assert_eq!(parse_longhand!(animation_name, "other-name, none, 'other-name', \"other-name\""),
animation_name::SpecifiedValue(
vec![SingleValue(other_name.clone()),
SingleValue(atom!("")),
SingleValue(other_name.clone()),
SingleValue(other_name.clone())]));
}
#[test]
fn test_animation_iteration() {
assert_roundtrip_with_context!(AnimationIterationCount::parse, "0", "0");

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

@ -983,7 +983,7 @@ mod shorthand_serialization {
let serialization = block.to_css_string();
assert_eq!(serialization, "animation: 1s ease-in 0s infinite normal forwards paused bounce;")
assert_eq!(serialization, "animation: 1s ease-in 0s normal forwards infinite paused bounce;")
}
#[test]
@ -1001,8 +1001,8 @@ mod shorthand_serialization {
let serialization = block.to_css_string();
assert_eq!(serialization,
"animation: 1s ease-in 0s infinite normal forwards paused bounce, \
0.2s linear 1s 2 reverse backwards running roll;");
"animation: 1s ease-in 0s normal forwards infinite paused bounce, \
0.2s linear 1s reverse backwards 2 running roll;");
}
#[test]