| Index: Source/core/animation/AnimationEffectTiming.cpp
|
| diff --git a/Source/core/animation/AnimationNodeTiming.cpp b/Source/core/animation/AnimationEffectTiming.cpp
|
| similarity index 66%
|
| rename from Source/core/animation/AnimationNodeTiming.cpp
|
| rename to Source/core/animation/AnimationEffectTiming.cpp
|
| index 07624e869ad207df05a6318f3216d3ea59b51208..6f9fd6f5f4188c6bda5efb2a8bdde10190b9a210 100644
|
| --- a/Source/core/animation/AnimationNodeTiming.cpp
|
| +++ b/Source/core/animation/AnimationEffectTiming.cpp
|
| @@ -3,51 +3,51 @@
|
| // found in the LICENSE file.
|
|
|
| #include "config.h"
|
| -#include "core/animation/AnimationNodeTiming.h"
|
| +#include "core/animation/AnimationEffectTiming.h"
|
|
|
| #include "bindings/core/v8/UnionTypesCore.h"
|
| -#include "core/animation/Animation.h"
|
| -#include "core/animation/AnimationNode.h"
|
| +#include "core/animation/AnimationEffect.h"
|
| +#include "core/animation/KeyframeEffect.h"
|
| #include "platform/animation/TimingFunction.h"
|
|
|
| namespace blink {
|
|
|
| -PassRefPtrWillBeRawPtr<AnimationNodeTiming> AnimationNodeTiming::create(AnimationNode* parent)
|
| +PassRefPtrWillBeRawPtr<AnimationEffectTiming> AnimationEffectTiming::create(AnimationEffect* parent)
|
| {
|
| - return adoptRefWillBeNoop(new AnimationNodeTiming(parent));
|
| + return adoptRefWillBeNoop(new AnimationEffectTiming(parent));
|
| }
|
|
|
| -AnimationNodeTiming::AnimationNodeTiming(AnimationNode* parent)
|
| +AnimationEffectTiming::AnimationEffectTiming(AnimationEffect* parent)
|
| : m_parent(parent)
|
| {
|
| }
|
|
|
| -double AnimationNodeTiming::delay()
|
| +double AnimationEffectTiming::delay()
|
| {
|
| return m_parent->specifiedTiming().startDelay * 1000;
|
| }
|
|
|
| -double AnimationNodeTiming::endDelay()
|
| +double AnimationEffectTiming::endDelay()
|
| {
|
| return m_parent->specifiedTiming().endDelay * 1000;
|
| }
|
|
|
| -String AnimationNodeTiming::fill()
|
| +String AnimationEffectTiming::fill()
|
| {
|
| return Timing::fillModeString(m_parent->specifiedTiming().fillMode);
|
| }
|
|
|
| -double AnimationNodeTiming::iterationStart()
|
| +double AnimationEffectTiming::iterationStart()
|
| {
|
| return m_parent->specifiedTiming().iterationStart;
|
| }
|
|
|
| -double AnimationNodeTiming::iterations()
|
| +double AnimationEffectTiming::iterations()
|
| {
|
| return m_parent->specifiedTiming().iterationCount;
|
| }
|
|
|
| -void AnimationNodeTiming::duration(UnrestrictedDoubleOrString& returnValue)
|
| +void AnimationEffectTiming::duration(UnrestrictedDoubleOrString& returnValue)
|
| {
|
| if (std::isnan(m_parent->specifiedTiming().iterationDuration))
|
| returnValue.setString("auto");
|
| @@ -55,57 +55,57 @@ void AnimationNodeTiming::duration(UnrestrictedDoubleOrString& returnValue)
|
| returnValue.setUnrestrictedDouble(m_parent->specifiedTiming().iterationDuration * 1000);
|
| }
|
|
|
| -double AnimationNodeTiming::playbackRate()
|
| +double AnimationEffectTiming::playbackRate()
|
| {
|
| return m_parent->specifiedTiming().playbackRate;
|
| }
|
|
|
| -String AnimationNodeTiming::direction()
|
| +String AnimationEffectTiming::direction()
|
| {
|
| return Timing::playbackDirectionString(m_parent->specifiedTiming().direction);
|
| }
|
|
|
| -String AnimationNodeTiming::easing()
|
| +String AnimationEffectTiming::easing()
|
| {
|
| return m_parent->specifiedTiming().timingFunction->toString();
|
| }
|
|
|
| -void AnimationNodeTiming::setDelay(double delay)
|
| +void AnimationEffectTiming::setDelay(double delay)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setStartDelay(timing, delay);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setEndDelay(double endDelay)
|
| +void AnimationEffectTiming::setEndDelay(double endDelay)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setEndDelay(timing, endDelay);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setFill(String fill)
|
| +void AnimationEffectTiming::setFill(String fill)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setFillMode(timing, fill);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setIterationStart(double iterationStart)
|
| +void AnimationEffectTiming::setIterationStart(double iterationStart)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setIterationStart(timing, iterationStart);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setIterations(double iterations)
|
| +void AnimationEffectTiming::setIterations(double iterations)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setIterationCount(timing, iterations);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setDuration(const UnrestrictedDoubleOrString& durationOrAuto)
|
| +void AnimationEffectTiming::setDuration(const UnrestrictedDoubleOrString& durationOrAuto)
|
| {
|
| // Any strings other than "auto" are coerced to "auto".
|
| double duration = durationOrAuto.isString() ? std::numeric_limits<double>::quiet_NaN() : durationOrAuto.getAsUnrestrictedDouble();
|
| @@ -114,28 +114,28 @@ void AnimationNodeTiming::setDuration(const UnrestrictedDoubleOrString& duration
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setPlaybackRate(double playbackRate)
|
| +void AnimationEffectTiming::setPlaybackRate(double playbackRate)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setPlaybackRate(timing, playbackRate);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setDirection(String direction)
|
| +void AnimationEffectTiming::setDirection(String direction)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setPlaybackDirection(timing, direction);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -void AnimationNodeTiming::setEasing(String easing)
|
| +void AnimationEffectTiming::setEasing(String easing)
|
| {
|
| Timing timing = m_parent->specifiedTiming();
|
| TimingInput::setTimingFunction(timing, easing);
|
| m_parent->updateSpecifiedTiming(timing);
|
| }
|
|
|
| -DEFINE_TRACE(AnimationNodeTiming)
|
| +DEFINE_TRACE(AnimationEffectTiming)
|
| {
|
| visitor->trace(m_parent);
|
| }
|
|
|