Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(440)

Unified Diff: Source/core/animation/AnimationEffect.cpp

Issue 1328723003: Rename KeyframeEffect::isAnimation to KeyframeEffect::isKeyframeEffect (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/animation/AnimationEffect.h ('k') | Source/core/animation/ElementAnimations.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationEffect.cpp
diff --git a/Source/core/animation/AnimationEffect.cpp b/Source/core/animation/AnimationEffect.cpp
index 83b2a3b5449b85591312b34843b23385eced7812..6668ffb36df6782d628e8c44f5987df86a784099 100644
--- a/Source/core/animation/AnimationEffect.cpp
+++ b/Source/core/animation/AnimationEffect.cpp
@@ -115,7 +115,7 @@ void AnimationEffect::computedTiming(ComputedTimingProperties& computedTiming)
// KeyframeEffectOptions members.
computedTiming.setDelay(specifiedTiming().startDelay * 1000);
computedTiming.setEndDelay(specifiedTiming().endDelay * 1000);
- computedTiming.setFill(Timing::fillModeString(resolvedFillMode(specifiedTiming().fillMode, isAnimation())));
+ computedTiming.setFill(Timing::fillModeString(resolvedFillMode(specifiedTiming().fillMode, isKeyframeEffect())));
computedTiming.setIterationStart(specifiedTiming().iterationStart);
computedTiming.setIterations(specifiedTiming().iterationCount);
@@ -150,7 +150,7 @@ void AnimationEffect::updateInheritedTime(double inheritedTime, TimingUpdateReas
const Phase currentPhase = calculatePhase(activeDuration, localTime, m_timing);
// FIXME: parentPhase depends on groups being implemented.
const AnimationEffect::Phase parentPhase = AnimationEffect::PhaseActive;
- const double activeTime = calculateActiveTime(activeDuration, resolvedFillMode(m_timing.fillMode, isAnimation()), localTime, parentPhase, currentPhase, m_timing);
+ const double activeTime = calculateActiveTime(activeDuration, resolvedFillMode(m_timing.fillMode, isKeyframeEffect()), localTime, parentPhase, currentPhase, m_timing);
double currentIteration;
double timeFraction;
@@ -176,7 +176,7 @@ void AnimationEffect::updateInheritedTime(double inheritedTime, TimingUpdateReas
ASSERT(localActiveDuration >= 0);
const double localLocalTime = localTime < m_timing.startDelay ? localTime : localActiveDuration + m_timing.startDelay;
const AnimationEffect::Phase localCurrentPhase = calculatePhase(localActiveDuration, localLocalTime, m_timing);
- const double localActiveTime = calculateActiveTime(localActiveDuration, resolvedFillMode(m_timing.fillMode, isAnimation()), localLocalTime, parentPhase, localCurrentPhase, m_timing);
+ const double localActiveTime = calculateActiveTime(localActiveDuration, resolvedFillMode(m_timing.fillMode, isKeyframeEffect()), localLocalTime, parentPhase, localCurrentPhase, m_timing);
const double startOffset = m_timing.iterationStart * localIterationDuration;
ASSERT(startOffset >= 0);
const double scaledActiveTime = calculateScaledActiveTime(localActiveDuration, localActiveTime, startOffset, m_timing);
« no previous file with comments | « Source/core/animation/AnimationEffect.h ('k') | Source/core/animation/ElementAnimations.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698