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

Unified Diff: Source/core/animation/TimedItemCalculations.h

Issue 178663007: Web Animations: Reduce duplication of Timing defaults. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/Animation.cpp ('k') | Source/core/animation/TimedItemCalculationsTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/TimedItemCalculations.h
diff --git a/Source/core/animation/TimedItemCalculations.h b/Source/core/animation/TimedItemCalculations.h
index 5226395e864c259167e436cf5a85dff1e7e7b1ab..75b949ae756ca387bb276e642b86c28a609086de 100644
--- a/Source/core/animation/TimedItemCalculations.h
+++ b/Source/core/animation/TimedItemCalculations.h
@@ -190,9 +190,7 @@ static inline double calculateTransformedTime(double currentIteration, double it
return directedTime;
double timeFraction = directedTime / iterationDuration;
ASSERT(timeFraction >= 0 && timeFraction <= 1);
- return specified.timingFunction
- ? multiplyZeroAlwaysGivesZero(iterationDuration, specified.timingFunction->evaluate(timeFraction, accuracyForDuration(iterationDuration)))
- : directedTime;
+ return multiplyZeroAlwaysGivesZero(iterationDuration, specified.timingFunction->evaluate(timeFraction, accuracyForDuration(iterationDuration)));
}
} // namespace WebCore
« no previous file with comments | « Source/core/animation/Animation.cpp ('k') | Source/core/animation/TimedItemCalculationsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698