OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "CCKeyframedAnimationCurve.h" | 7 #include "CCKeyframedAnimationCurve.h" |
8 | 8 |
9 using WebKit::WebTransformationMatrix; | 9 using WebKit::WebTransformationMatrix; |
10 | 10 |
(...skipping 13 matching lines...) Expand all Loading... |
24 return; | 24 return; |
25 } | 25 } |
26 } | 26 } |
27 } | 27 } |
28 | 28 |
29 keyframes.append(keyframe.Pass()); | 29 keyframes.append(keyframe.Pass()); |
30 } | 30 } |
31 | 31 |
32 scoped_ptr<CCTimingFunction> cloneTimingFunction(const CCTimingFunction* timingF
unction) | 32 scoped_ptr<CCTimingFunction> cloneTimingFunction(const CCTimingFunction* timingF
unction) |
33 { | 33 { |
34 ASSERT(timingFunction); | 34 DCHECK(timingFunction); |
35 scoped_ptr<CCAnimationCurve> curve(timingFunction->clone()); | 35 scoped_ptr<CCAnimationCurve> curve(timingFunction->clone()); |
36 return scoped_ptr<CCTimingFunction>(static_cast<CCTimingFunction*>(curve.rel
ease())); | 36 return scoped_ptr<CCTimingFunction>(static_cast<CCTimingFunction*>(curve.rel
ease())); |
37 } | 37 } |
38 | 38 |
39 } // namespace | 39 } // namespace |
40 | 40 |
41 CCKeyframe::CCKeyframe(double time, scoped_ptr<CCTimingFunction> timingFunction) | 41 CCKeyframe::CCKeyframe(double time, scoped_ptr<CCTimingFunction> timingFunction) |
42 : m_time(time) | 42 : m_time(time) |
43 , m_timingFunction(timingFunction.Pass()) | 43 , m_timingFunction(timingFunction.Pass()) |
44 { | 44 { |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 | 214 |
215 double progress = (t - m_keyframes[i]->time()) / (m_keyframes[i+1]->time() -
m_keyframes[i]->time()); | 215 double progress = (t - m_keyframes[i]->time()) / (m_keyframes[i+1]->time() -
m_keyframes[i]->time()); |
216 | 216 |
217 if (m_keyframes[i]->timingFunction()) | 217 if (m_keyframes[i]->timingFunction()) |
218 progress = m_keyframes[i]->timingFunction()->getValue(progress); | 218 progress = m_keyframes[i]->timingFunction()->getValue(progress); |
219 | 219 |
220 return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress); | 220 return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress); |
221 } | 221 } |
222 | 222 |
223 } // namespace cc | 223 } // namespace cc |
OLD | NEW |