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 12 matching lines...) Expand all Loading... |
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/FloatPoint.h" | 31 #include "platform/geometry/FloatPoint.h" |
32 #include "platform/geometry/IntPoint.h" | 32 #include "platform/geometry/IntPoint.h" |
| 33 #include "ui/gfx/geometry/cubic_bezier.h" |
33 #include "wtf/MathExtras.h" | 34 #include "wtf/MathExtras.h" |
34 | 35 |
| 36 #include <algorithm> |
35 #include <type_traits> | 37 #include <type_traits> |
36 | 38 |
37 namespace blink { | 39 namespace blink { |
38 | 40 |
39 inline int blend(int from, int to, double progress) | 41 inline int blend(int from, int to, double progress) |
40 { | 42 { |
41 return lround(from + (to - from) * progress); | 43 return lround(from + (to - from) * progress); |
42 } | 44 } |
43 | 45 |
44 // For unsigned types. | 46 // For unsigned types. |
(...skipping 25 matching lines...) Expand all Loading... |
70 } | 72 } |
71 | 73 |
72 inline FloatPoint blend(const FloatPoint& from, const FloatPoint& to, double pro
gress) | 74 inline FloatPoint blend(const FloatPoint& from, const FloatPoint& to, double pro
gress) |
73 { | 75 { |
74 return FloatPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(),
progress)); | 76 return FloatPoint(blend(from.x(), to.x(), progress), blend(from.y(), to.y(),
progress)); |
75 } | 77 } |
76 | 78 |
77 // Calculates the accuracy for evaluating a timing function for an animation wit
h the specified duration. | 79 // Calculates the accuracy for evaluating a timing function for an animation wit
h the specified duration. |
78 inline double accuracyForDuration(double duration) | 80 inline double accuracyForDuration(double duration) |
79 { | 81 { |
80 return 1.0 / (200.0 * duration); | 82 return std::max(1.0 / (200.0 * duration), gfx::CubicBezier::GetDefaultEpsilo
n()); |
81 } | 83 } |
82 | 84 |
83 } // namespace blink | 85 } // namespace blink |
84 | 86 |
85 #endif // AnimationUtilities_h | 87 #endif // AnimationUtilities_h |
OLD | NEW |