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

Unified Diff: Source/WebCore/platform/animation/AnimationUtilities.h

Issue 9328025: Merge 106672 - REGRESSION (r105401-105403): Blue flash on css border transition (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 11 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 | « LayoutTests/animations/animation-border-overflow-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/animation/AnimationUtilities.h
===================================================================
--- Source/WebCore/platform/animation/AnimationUtilities.h (revision 106716)
+++ Source/WebCore/platform/animation/AnimationUtilities.h (working copy)
@@ -37,7 +37,7 @@
inline unsigned blend(unsigned from, unsigned to, double progress)
{
- return static_cast<unsigned>(lround(static_cast<double>(from) + static_cast<double>(to - from) * progress));
+ return static_cast<unsigned>(lround(to > from ? static_cast<double>(from) + static_cast<double>(to - from) * progress : static_cast<double>(from) - static_cast<double>(from - to) * progress));
}
inline double blend(double from, double to, double progress)
« no previous file with comments | « LayoutTests/animations/animation-border-overflow-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698