Skip to content

Commit

Permalink
animation-iteration-count property is a number instead of integer.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroyuki Ikezoe committed Jan 5, 2017
1 parent 16b0da5 commit f78cd2c
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 8 deletions.
6 changes: 3 additions & 3 deletions components/style/animation.rs
Expand Up @@ -32,7 +32,7 @@ pub enum KeyframesIterationState {
/// Infinite iterations, so no need to track a state.
Infinite,
/// Current and max iterations.
Finite(u32, u32),
Finite(f32, f32),
}

/// This structure represents wether an animation is actually running.
Expand Down Expand Up @@ -92,7 +92,7 @@ impl KeyframesAnimationState {
}

if let KeyframesIterationState::Finite(ref mut current, ref max) = self.iteration_state {
*current += 1;
*current += 1.0;
// NB: This prevent us from updating the direction, which might be
// needed for the correct handling of animation-fill-mode.
if *current >= *max {
Expand Down Expand Up @@ -473,7 +473,7 @@ pub fn maybe_start_animations(context: &SharedStyleContext,
let duration = box_style.animation_duration_mod(i).seconds();
let iteration_state = match box_style.animation_iteration_count_mod(i) {
AnimationIterationCount::Infinite => KeyframesIterationState::Infinite,
AnimationIterationCount::Number(n) => KeyframesIterationState::Finite(0, n),
AnimationIterationCount::Number(n) => KeyframesIterationState::Finite(0.0, n),
};

let animation_direction = box_style.animation_direction_mod(i);
Expand Down
11 changes: 6 additions & 5 deletions components/style/properties/longhand/box.mako.rs
Expand Up @@ -828,10 +828,11 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",

pub use self::AnimationIterationCount as SingleComputedValue;

// https://drafts.csswg.org/css-animations/#animation-iteration-count
#[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum AnimationIterationCount {
Number(u32),
Number(f32),
Infinite,
}

Expand All @@ -841,12 +842,12 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
return Ok(AnimationIterationCount::Infinite)
}

let number = try!(input.expect_integer());
if number < 0 {
let number = try!(input.expect_number());
if number < 0.0 {
return Err(());
}

Ok(AnimationIterationCount::Number(number as u32))
Ok(AnimationIterationCount::Number(number))
}
}

Expand Down Expand Up @@ -886,7 +887,7 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",

#[inline]
pub fn get_initial_single_value() -> AnimationIterationCount {
AnimationIterationCount::Number(1)
AnimationIterationCount::Number(1.0)
}

#[inline]
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/style/parsing/animation.rs
@@ -0,0 +1,21 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

use cssparser::Parser;
use media_queries::CSSErrorReporterTest;
use parsing::parse;
use style::parser::{Parse, ParserContext};
use style::properties::longhands::animation_iteration_count::computed_value::AnimationIterationCount;
use style::stylesheets::Origin;
use style_traits::ToCss;

#[test]
fn test_animation_iteration() {
assert_roundtrip_with_context!(AnimationIterationCount::parse, "0", "0");
assert_roundtrip_with_context!(AnimationIterationCount::parse, "0.1", "0.1");
assert_roundtrip_with_context!(AnimationIterationCount::parse, "infinite", "infinite");

// Negative numbers are invalid
assert!(parse(AnimationIterationCount::parse, "-1").is_err());
}
1 change: 1 addition & 0 deletions tests/unit/style/parsing/mod.rs
Expand Up @@ -47,6 +47,7 @@ macro_rules! parse_longhand {
}};
}

mod animation;
mod background;
mod basic_shape;
mod border;
Expand Down

0 comments on commit f78cd2c

Please sign in to comment.