| Index: Source/core/animation/Animation.cpp
|
| diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
|
| index 9d8e7e3056d97657ac936bd068ab23c46a2663f3..db2b110b8d8b96e77715f4e172037bb23d1e99d2 100644
|
| --- a/Source/core/animation/Animation.cpp
|
| +++ b/Source/core/animation/Animation.cpp
|
| @@ -326,7 +326,7 @@ bool Animation::updateChildrenAndEffects() const
|
|
|
| double Animation::calculateTimeToEffectChange(double localTime, double timeToNextIteration) const
|
| {
|
| - const double activeStartTime = startTime() + specified().startDelay;
|
| + const double activeStartTime = startTime() + specifiedTiming().startDelay;
|
| switch (phase()) {
|
| case PhaseBefore:
|
| return activeStartTime - localTime;
|
| @@ -355,7 +355,7 @@ bool Animation::isCandidateForAnimationOnCompositor() const
|
| {
|
| if (!effect() || !m_target)
|
| return false;
|
| - return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specified(), *effect());
|
| + return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *effect());
|
| }
|
|
|
| bool Animation::maybeStartAnimationOnCompositor()
|
| @@ -365,7 +365,7 @@ bool Animation::maybeStartAnimationOnCompositor()
|
| return false;
|
| if (!CompositorAnimations::instance()->canStartAnimationOnCompositor(*m_target.get()))
|
| return false;
|
| - if (!CompositorAnimations::instance()->startAnimationOnCompositor(*m_target.get(), specified(), *effect(), m_compositorAnimationIds))
|
| + if (!CompositorAnimations::instance()->startAnimationOnCompositor(*m_target.get(), specifiedTiming(), *effect(), m_compositorAnimationIds))
|
| return false;
|
| ASSERT(!m_compositorAnimationIds.isEmpty());
|
| return true;
|
|
|