| Index: cc/keyframed_animation_curve.cc
|
| diff --git a/cc/keyframed_animation_curve.cc b/cc/keyframed_animation_curve.cc
|
| index 9cf0ef37e14343565988e9e3a755d7e82453c2b7..ef03357a26a30e96238c0a947a8c32f0787214d2 100644
|
| --- a/cc/keyframed_animation_curve.cc
|
| +++ b/cc/keyframed_animation_curve.cc
|
| @@ -15,16 +15,16 @@ void insertKeyframe(scoped_ptr<Keyframe> keyframe, ScopedPtrVector<Keyframe>& ke
|
| {
|
| // Usually, the keyframes will be added in order, so this loop would be unnecessary and
|
| // we should skip it if possible.
|
| - if (!keyframes.isEmpty() && keyframe->time() < keyframes.last()->time()) {
|
| + if (!keyframes.empty() && keyframe->time() < keyframes.back()->time()) {
|
| for (size_t i = 0; i < keyframes.size(); ++i) {
|
| if (keyframe->time() < keyframes[i]->time()) {
|
| - keyframes.insert(i, keyframe.Pass());
|
| + keyframes.insert(keyframes.begin() + i, keyframe.Pass());
|
| return;
|
| }
|
| }
|
| }
|
|
|
| - keyframes.append(keyframe.Pass());
|
| + keyframes.push_back(keyframe.Pass());
|
| }
|
|
|
| scoped_ptr<TimingFunction> cloneTimingFunction(const TimingFunction* timingFunction)
|
| @@ -132,7 +132,7 @@ void KeyframedFloatAnimationCurve::addKeyframe(scoped_ptr<FloatKeyframe> keyfram
|
|
|
| double KeyframedFloatAnimationCurve::duration() const
|
| {
|
| - return m_keyframes.last()->time() - m_keyframes.first()->time();
|
| + return m_keyframes.back()->time() - m_keyframes.front()->time();
|
| }
|
|
|
| scoped_ptr<AnimationCurve> KeyframedFloatAnimationCurve::clone() const
|
| @@ -145,11 +145,11 @@ scoped_ptr<AnimationCurve> KeyframedFloatAnimationCurve::clone() const
|
|
|
| float KeyframedFloatAnimationCurve::getValue(double t) const
|
| {
|
| - if (t <= m_keyframes.first()->time())
|
| - return m_keyframes.first()->value();
|
| + if (t <= m_keyframes.front()->time())
|
| + return m_keyframes.front()->value();
|
|
|
| - if (t >= m_keyframes.last()->time())
|
| - return m_keyframes.last()->value();
|
| + if (t >= m_keyframes.back()->time())
|
| + return m_keyframes.back()->value();
|
|
|
| size_t i = 0;
|
| for (; i < m_keyframes.size() - 1; ++i) {
|
| @@ -185,7 +185,7 @@ void KeyframedTransformAnimationCurve::addKeyframe(scoped_ptr<TransformKeyframe>
|
|
|
| double KeyframedTransformAnimationCurve::duration() const
|
| {
|
| - return m_keyframes.last()->time() - m_keyframes.first()->time();
|
| + return m_keyframes.back()->time() - m_keyframes.front()->time();
|
| }
|
|
|
| scoped_ptr<AnimationCurve> KeyframedTransformAnimationCurve::clone() const
|
| @@ -198,11 +198,11 @@ scoped_ptr<AnimationCurve> KeyframedTransformAnimationCurve::clone() const
|
|
|
| WebTransformationMatrix KeyframedTransformAnimationCurve::getValue(double t) const
|
| {
|
| - if (t <= m_keyframes.first()->time())
|
| - return m_keyframes.first()->value().apply();
|
| + if (t <= m_keyframes.front()->time())
|
| + return m_keyframes.front()->value().apply();
|
|
|
| - if (t >= m_keyframes.last()->time())
|
| - return m_keyframes.last()->value().apply();
|
| + if (t >= m_keyframes.back()->time())
|
| + return m_keyframes.back()->value().apply();
|
|
|
| size_t i = 0;
|
| for (; i < m_keyframes.size() - 1; ++i) {
|
|
|