| Index: Source/core/page/animation/KeyframeAnimation.cpp
|
| diff --git a/Source/core/page/animation/KeyframeAnimation.cpp b/Source/core/page/animation/KeyframeAnimation.cpp
|
| index 90b33051e507392c26f3fba5b56a4e2993dbebcd..4e7859c11695b699d545276d5186994c926ca272 100644
|
| --- a/Source/core/page/animation/KeyframeAnimation.cpp
|
| +++ b/Source/core/page/animation/KeyframeAnimation.cpp
|
| @@ -43,7 +43,7 @@ using namespace std;
|
|
|
| namespace WebCore {
|
|
|
| -KeyframeAnimation::KeyframeAnimation(const CSSAnimationData* animation, RenderObject* renderer, int index, CompositeAnimation* compAnim, RenderStyle* unanimatedStyle)
|
| +KeyframeAnimation::KeyframeAnimation(const StyleAnimationData* animation, RenderObject* renderer, int index, CompositeAnimation* compAnim, RenderStyle* unanimatedStyle)
|
| : AnimationBase(animation, renderer, compAnim)
|
| , m_keyframes(renderer, animation->name())
|
| , m_index(index)
|
| @@ -66,7 +66,7 @@ KeyframeAnimation::~KeyframeAnimation()
|
| endAnimation();
|
| }
|
|
|
| -static const CSSAnimationData* getAnimationFromStyleByName(const RenderStyle* style, const AtomicString& name)
|
| +static const StyleAnimationData* getAnimationFromStyleByName(const RenderStyle* style, const AtomicString& name)
|
| {
|
| if (!style->animations())
|
| return 0;
|
| @@ -83,7 +83,7 @@ void KeyframeAnimation::fetchIntervalEndpointsForProperty(CSSPropertyID property
|
| {
|
| // Find the first key
|
| double elapsedTime = getElapsedTime();
|
| - if (m_animation->duration() && m_animation->iterationCount() != CSSAnimationData::IterationCountInfinite)
|
| + if (m_animation->duration() && m_animation->iterationCount() != StyleAnimationData::IterationCountInfinite)
|
| elapsedTime = min(elapsedTime, m_animation->duration() * m_animation->iterationCount());
|
|
|
| const double fractionalTime = this->fractionalTime(1, elapsedTime, 0);
|
| @@ -132,7 +132,7 @@ void KeyframeAnimation::fetchIntervalEndpointsForProperty(CSSPropertyID property
|
| scale = 1.0 / (nextKeyframe.key() - prevKeyframe.key());
|
|
|
| const TimingFunction* timingFunction = 0;
|
| - if (const CSSAnimationData* matchedAnimation = getAnimationFromStyleByName(fromStyle, name()))
|
| + if (const StyleAnimationData* matchedAnimation = getAnimationFromStyleByName(fromStyle, name()))
|
| timingFunction = matchedAnimation->timingFunction().get();
|
|
|
| prog = progress(scale, offset, timingFunction);
|
|
|