OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 12 matching lines...) Expand all Loading... |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "core/animation/animatable/AnimatableValue.h" | 31 #include "core/animation/animatable/AnimatableValue.h" |
32 | 32 |
| 33 #include <algorithm> |
33 #include "core/animation/animatable/AnimatableNeutral.h" | 34 #include "core/animation/animatable/AnimatableNeutral.h" |
34 #include "wtf/StdLibExtras.h" | 35 #include "wtf/StdLibExtras.h" |
35 #include <algorithm> | |
36 | 36 |
37 namespace blink { | 37 namespace blink { |
38 | 38 |
39 PassRefPtr<AnimatableValue> AnimatableValue::neutralValue() { | 39 PassRefPtr<AnimatableValue> AnimatableValue::neutralValue() { |
40 DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, | 40 DEFINE_STATIC_REF(AnimatableNeutral, neutralSentinelValue, |
41 (AnimatableNeutral::create())); | 41 (AnimatableNeutral::create())); |
42 return neutralSentinelValue; | 42 return neutralSentinelValue; |
43 } | 43 } |
44 | 44 |
45 PassRefPtr<AnimatableValue> AnimatableValue::interpolate( | 45 PassRefPtr<AnimatableValue> AnimatableValue::interpolate( |
46 const AnimatableValue* left, | 46 const AnimatableValue* left, |
47 const AnimatableValue* right, | 47 const AnimatableValue* right, |
48 double fraction) { | 48 double fraction) { |
49 DCHECK(left); | 49 DCHECK(left); |
50 DCHECK(right); | 50 DCHECK(right); |
51 DCHECK(!left->isNeutral()); | 51 DCHECK(!left->isNeutral()); |
52 DCHECK(!right->isNeutral()); | 52 DCHECK(!right->isNeutral()); |
53 | 53 |
54 if (fraction && fraction != 1 && left->isSameType(right)) | 54 if (fraction && fraction != 1 && left->isSameType(right)) |
55 return left->interpolateTo(right, fraction); | 55 return left->interpolateTo(right, fraction); |
56 | 56 |
57 return defaultInterpolateTo(left, right, fraction); | 57 return defaultInterpolateTo(left, right, fraction); |
58 } | 58 } |
59 | 59 |
60 } // namespace blink | 60 } // namespace blink |
OLD | NEW |