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 "cc/keyframed_animation_curve.h" |
8 | 8 |
9 using WebKit::WebTransformationMatrix; | 9 using WebKit::WebTransformationMatrix; |
10 | 10 |
11 namespace cc { | 11 namespace cc { |
12 | 12 |
13 namespace { | 13 namespace { |
14 | 14 |
15 template <class Keyframe> | 15 template <class Keyframe> |
16 void insertKeyframe(scoped_ptr<Keyframe> keyframe, ScopedPtrVector<Keyframe>& ke
yframes) | 16 void insertKeyframe(scoped_ptr<Keyframe> keyframe, ScopedPtrVector<Keyframe>& ke
yframes) |
17 { | 17 { |
(...skipping 196 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 |