| Index: third_party/WebKit/Source/core/animation/TimingCalculations.h
|
| diff --git a/third_party/WebKit/Source/core/animation/TimingCalculations.h b/third_party/WebKit/Source/core/animation/TimingCalculations.h
|
| index 792b213903ab2a40eb5a4d1083c10ae70cd7b017..d3e3c9a9142c4283a405c68339f3154cf98cd494 100644
|
| --- a/third_party/WebKit/Source/core/animation/TimingCalculations.h
|
| +++ b/third_party/WebKit/Source/core/animation/TimingCalculations.h
|
| @@ -50,9 +50,10 @@ static inline AnimationEffect::Phase calculatePhase(double activeDuration, doubl
|
| ASSERT(activeDuration >= 0);
|
| if (isNull(localTime))
|
| return AnimationEffect::PhaseNone;
|
| - if (localTime < specified.startDelay)
|
| + double endTime = specified.startDelay + activeDuration + specified.endDelay;
|
| + if (localTime < std::min(specified.startDelay, endTime))
|
| return AnimationEffect::PhaseBefore;
|
| - if (localTime >= specified.startDelay + activeDuration)
|
| + if (localTime >= std::min(specified.startDelay + activeDuration, endTime))
|
| return AnimationEffect::PhaseAfter;
|
| return AnimationEffect::PhaseActive;
|
| }
|
|
|