diff options
Diffstat (limited to 'WebCore/page/animation/CompositeAnimation.cpp')
-rw-r--r-- | WebCore/page/animation/CompositeAnimation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/WebCore/page/animation/CompositeAnimation.cpp b/WebCore/page/animation/CompositeAnimation.cpp index 57c2aa4..9d021b4 100644 --- a/WebCore/page/animation/CompositeAnimation.cpp +++ b/WebCore/page/animation/CompositeAnimation.cpp @@ -229,7 +229,7 @@ void CompositeAnimation::updateKeyframeAnimations(RenderObject* renderer, Render // This one is still active. // Animations match, but play states may differ. Update if needed. - keyframeAnim->updatePlayState(anim->playState() == AnimPlayStatePlaying); + keyframeAnim->updatePlayState(anim->playState()); // Set the saved animation to this new one, just in case the play state has changed. keyframeAnim->setAnimation(anim); @@ -386,17 +386,17 @@ PassRefPtr<KeyframeAnimation> CompositeAnimation::getAnimationForProperty(int pr void CompositeAnimation::suspendAnimations() { - if (m_isSuspended) + if (m_suspended) return; - m_isSuspended = true; + m_suspended = true; if (!m_keyframeAnimations.isEmpty()) { m_keyframeAnimations.checkConsistency(); AnimationNameMap::const_iterator animationsEnd = m_keyframeAnimations.end(); for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != animationsEnd; ++it) { if (KeyframeAnimation* anim = it->second.get()) - anim->updatePlayState(false); + anim->updatePlayState(AnimPlayStatePaused); } } if (!m_transitions.isEmpty()) { @@ -404,17 +404,17 @@ void CompositeAnimation::suspendAnimations() for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) { ImplicitAnimation* anim = it->second.get(); if (anim && anim->hasStyle()) - anim->updatePlayState(false); + anim->updatePlayState(AnimPlayStatePaused); } } } void CompositeAnimation::resumeAnimations() { - if (!m_isSuspended) + if (!m_suspended) return; - m_isSuspended = false; + m_suspended = false; if (!m_keyframeAnimations.isEmpty()) { m_keyframeAnimations.checkConsistency(); @@ -422,7 +422,7 @@ void CompositeAnimation::resumeAnimations() for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != animationsEnd; ++it) { KeyframeAnimation* anim = it->second.get(); if (anim && anim->playStatePlaying()) - anim->updatePlayState(true); + anim->updatePlayState(AnimPlayStatePlaying); } } @@ -431,7 +431,7 @@ void CompositeAnimation::resumeAnimations() for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) { ImplicitAnimation* anim = it->second.get(); if (anim && anim->hasStyle()) - anim->updatePlayState(true); + anim->updatePlayState(AnimPlayStatePlaying); } } } |