| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2011 Apple Inc.  All rights reserved. | 2  * Copyright (C) 2011 Apple Inc.  All rights reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 24  */ | 24  */ | 
| 25 | 25 | 
| 26 #ifndef AnimationUtilities_h | 26 #ifndef AnimationUtilities_h | 
| 27 #define AnimationUtilities_h | 27 #define AnimationUtilities_h | 
| 28 | 28 | 
| 29 #include "platform/LayoutUnit.h" | 29 #include "platform/LayoutUnit.h" | 
| 30 #include "platform/PlatformExport.h" | 30 #include "platform/PlatformExport.h" | 
| 31 #include "platform/geometry/IntPoint.h" | 31 #include "platform/geometry/IntPoint.h" | 
|  | 32 #include "platform/geometry/LayoutPoint.h" | 
| 32 #include "wtf/MathExtras.h" | 33 #include "wtf/MathExtras.h" | 
| 33 #include "wtf/TypeTraits.h" | 34 #include "wtf/TypeTraits.h" | 
| 34 | 35 | 
| 35 namespace WebCore { | 36 namespace WebCore { | 
| 36 | 37 | 
| 37 inline int blend(int from, int to, double progress) | 38 inline int blend(int from, int to, double progress) | 
| 38 { | 39 { | 
| 39     return lround(from + (to - from) * progress); | 40     return lround(from + (to - from) * progress); | 
| 40 } | 41 } | 
| 41 | 42 | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 60 inline LayoutUnit blend(LayoutUnit from, LayoutUnit to, double progress) | 61 inline LayoutUnit blend(LayoutUnit from, LayoutUnit to, double progress) | 
| 61 { | 62 { | 
| 62     return from + (to - from) * progress; | 63     return from + (to - from) * progress; | 
| 63 } | 64 } | 
| 64 | 65 | 
| 65 inline IntPoint blend(const IntPoint& from, const IntPoint& to, double progress) | 66 inline IntPoint blend(const IntPoint& from, const IntPoint& to, double progress) | 
| 66 { | 67 { | 
| 67     return IntPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(), p
    rogress)); | 68     return IntPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(), p
    rogress)); | 
| 68 } | 69 } | 
| 69 | 70 | 
|  | 71 inline LayoutPoint blend(const LayoutPoint& from, const LayoutPoint& to, double 
    progress) | 
|  | 72 { | 
|  | 73     return LayoutPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y()
    , progress)); | 
|  | 74 } | 
|  | 75 | 
| 70 // Calculates the accuracy for evaluating a timing function for an animation wit
    h the specified duration. | 76 // Calculates the accuracy for evaluating a timing function for an animation wit
    h the specified duration. | 
| 71 inline double accuracyForDuration(double duration) | 77 inline double accuracyForDuration(double duration) | 
| 72 { | 78 { | 
| 73     return 1.0 / (200.0 * duration); | 79     return 1.0 / (200.0 * duration); | 
| 74 } | 80 } | 
| 75 | 81 | 
| 76 } // namespace WebCore | 82 } // namespace WebCore | 
| 77 | 83 | 
| 78 #endif // AnimationUtilities_h | 84 #endif // AnimationUtilities_h | 
| OLD | NEW | 
|---|