| 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 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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 "core/platform/LayoutUnit.h" | 29 #include "core/platform/LayoutUnit.h" |
| 30 #include "core/platform/graphics/IntPoint.h" | 30 #include "core/platform/graphics/IntPoint.h" |
| 31 #include "core/platform/graphics/LayoutPoint.h" |
| 31 #include "wtf/MathExtras.h" | 32 #include "wtf/MathExtras.h" |
| 32 | 33 |
| 33 namespace WebCore { | 34 namespace WebCore { |
| 34 | 35 |
| 35 inline int blend(int from, int to, double progress) | 36 inline int blend(int from, int to, double progress) |
| 36 { | 37 { |
| 37 return lround(from + (to - from) * progress); | 38 return lround(from + (to - from) * progress); |
| 38 } | 39 } |
| 39 | 40 |
| 40 inline unsigned blend(unsigned from, unsigned to, double progress) | 41 inline unsigned blend(unsigned from, unsigned to, double progress) |
| (...skipping 14 matching lines...) Expand all Loading... |
| 55 inline LayoutUnit blend(LayoutUnit from, LayoutUnit to, double progress) | 56 inline LayoutUnit blend(LayoutUnit from, LayoutUnit to, double progress) |
| 56 { | 57 { |
| 57 return from + (to - from) * progress; | 58 return from + (to - from) * progress; |
| 58 } | 59 } |
| 59 | 60 |
| 60 inline IntPoint blend(const IntPoint& from, const IntPoint& to, double progress) | 61 inline IntPoint blend(const IntPoint& from, const IntPoint& to, double progress) |
| 61 { | 62 { |
| 62 return IntPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(), p
rogress)); | 63 return IntPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(), p
rogress)); |
| 63 } | 64 } |
| 64 | 65 |
| 66 inline LayoutPoint blend(const LayoutPoint& from, const LayoutPoint& to, double
progress) |
| 67 { |
| 68 return LayoutPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y()
, progress)); |
| 69 } |
| 70 |
| 65 // Calculates the accuracy for evaluating a timing function for an animation wit
h the specified duration. | 71 // Calculates the accuracy for evaluating a timing function for an animation wit
h the specified duration. |
| 66 inline double accuracyForDuration(double duration) | 72 inline double accuracyForDuration(double duration) |
| 67 { | 73 { |
| 68 return 1.0 / (200.0 * duration); | 74 return 1.0 / (200.0 * duration); |
| 69 } | 75 } |
| 70 | 76 |
| 71 } // namespace WebCore | 77 } // namespace WebCore |
| 72 | 78 |
| 73 #endif // AnimationUtilities_h | 79 #endif // AnimationUtilities_h |
| OLD | NEW |