From 18a99e50d83cb396223d0c1664fb07318ea77edc Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Thu, 4 Jan 2018 19:12:45 +0900 Subject: [PATCH] Make transition_combined_duration_at consider duration and delay value are used by repeating the list of values if the given index is greater than the list length --- components/style/properties/gecko.mako.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/style/properties/gecko.mako.rs b/components/style/properties/gecko.mako.rs index 3f8cd13a103..a6263b598d6 100644 --- a/components/style/properties/gecko.mako.rs +++ b/components/style/properties/gecko.mako.rs @@ -3298,7 +3298,8 @@ fn static_assert() { pub fn transition_combined_duration_at(&self, index: usize) -> f32 { // https://drafts.csswg.org/css-transitions/#transition-combined-duration - self.gecko.mTransitions[index].mDuration.max(0.0) + self.gecko.mTransitions[index].mDelay + self.gecko.mTransitions[index % self.gecko.mTransitionDurationCount as usize].mDuration.max(0.0) + + self.gecko.mTransitions[index % self.gecko.mTransitionDelayCount as usize].mDelay } pub fn set_transition_property(&mut self, v: I)