| Index: Source/core/animation/Animation.cpp
|
| diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp
|
| index a3c02ae849a5c8631f9481609f685f431b1fb2b7..36c963b3decdd4a98c5ea5150a9ac5ebb0f40128 100644
|
| --- a/Source/core/animation/Animation.cpp
|
| +++ b/Source/core/animation/Animation.cpp
|
| @@ -339,7 +339,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;
|
| @@ -368,7 +368,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()
|
| @@ -378,7 +378,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;
|
|
|