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

Auto merge of #19005 - emilio:less-mako-more-joy, r=jdm

Browse source 
style: Move animation-name and animation-iteration-count outside of mako.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19005)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-24 15:29:21 -05:00 • committed by GitHub
commit f9f71c7ed1
11 changed files with 165 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,9 @@
use parsing::parse;
use servo_atoms::Atom;
use style::parser::Parse;
use style::properties::longhands::animation_iteration_count::single_value::computed_value::T as AnimationIterationCount;
use style::properties::longhands::animation_name;
use style::values::{KeyframesName, CustomIdent};
use style::values::specified::AnimationIterationCount;
use style_traits::ToCss;
#[test]

10
tests/wpt/metadata/MANIFEST.json
View file

@ -306159,6 +306159,12 @@
{}
]
],
"css/css-animations-1/animation-iteration-count-calc.html": [
[
"/css/css-animations-1/animation-iteration-count-calc.html",
{}
]
],
"css/css-animations-1/animationevent-interface.html": [
[
"/css/css-animations-1/animationevent-interface.html",
@ -474190,6 +474196,10 @@
"812d8b618aaf90cf6d772b61d0eaed55848e4c20",
"manual"
],
"css/css-animations-1/animation-iteration-count-calc.html": [
"e7558a046eb2856c666ba51c4208178b24706765",
"testharness"
],
"css/css-animations-1/animation-iteration-event.html": [
"3aec5072660e45e332d5858c8870980d3a8db966",
"manual"

15
tests/wpt/web-platform-tests/css/css-animations-1/animation-iteration-count-calc.html Normal file
View file

@ -0,0 +1,15 @@
<!doctype html>
<meta charset="utf-8">
<title>CSS Test: Animation count accepts calc()</title>
<link rel="author" name="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
<link rel="help" href="https://drafts.csswg.org/css-values-3/#number-value">
<link rel="help" href="https://drafts.csswg.org/css-animations/#animation-iteration-count">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<div id="target" style="animation-iteration-count: calc(1 + 3)">
<script>
test(function() {
let target = document.getElementById("target");
assert_equals(getComputedStyle(target).animationIterationCount, "4")
}, "calc() should be accepted in animation-iteration-count.");
</script>