author | Brian Birtles <birtles@gmail.com> |
Fri, 07 Aug 2015 12:29:35 +0900 | |
changeset 256749 | bcf2c0c393cf0642f7a100c3e4e7d6b0b6b748f5 |
parent 256748 | 4e8a8884e36ff65a91e732c0f5ed17dc823e565b |
child 256750 | f8b8e1084b4080b39a8278112aa4519cd0db0eba |
push id | 29187 |
push user | cbook@mozilla.com |
push date | Fri, 07 Aug 2015 11:13:32 +0000 |
treeherder | mozilla-central@3e51753a099f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dbaron |
bugs | 1181392 |
milestone | 42.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -231,45 +231,39 @@ KeyframeEffectReadOnly::ActiveDuration(c return StickyTimeDuration( aTiming.mIterationDuration.MultDouble(aTiming.mIterationCount)); } // http://w3c.github.io/web-animations/#in-play bool KeyframeEffectReadOnly::IsInPlay(const Animation& aAnimation) const { - if (IsFinishedTransition() || - aAnimation.PlayState() == AnimationPlayState::Finished) { + if (aAnimation.PlayState() == AnimationPlayState::Finished) { return false; } return GetComputedTiming().mPhase == ComputedTiming::AnimationPhase_Active; } // http://w3c.github.io/web-animations/#current bool KeyframeEffectReadOnly::IsCurrent(const Animation& aAnimation) const { - if (IsFinishedTransition() || - aAnimation.PlayState() == AnimationPlayState::Finished) { + if (aAnimation.PlayState() == AnimationPlayState::Finished) { return false; } ComputedTiming computedTiming = GetComputedTiming(); return computedTiming.mPhase == ComputedTiming::AnimationPhase_Before || computedTiming.mPhase == ComputedTiming::AnimationPhase_Active; } bool KeyframeEffectReadOnly::IsInEffect() const { - if (IsFinishedTransition()) { - return false; - } - ComputedTiming computedTiming = GetComputedTiming(); return computedTiming.mProgress != ComputedTiming::kNullProgress; } const AnimationProperty* KeyframeEffectReadOnly::GetAnimationOfProperty(nsCSSProperty aProperty) const { for (size_t propIdx = 0, propEnd = mProperties.Length();