Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: cc/keyframed_animation_curve.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_browsertests Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/io_surface_layer_impl.cc ('k') | cc/keyframed_animation_curve_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
6
7 #include "cc/keyframed_animation_curve.h" 5 #include "cc/keyframed_animation_curve.h"
8 6
9 using WebKit::WebTransformationMatrix; 7 using WebKit::WebTransformationMatrix;
10 8
11 namespace cc { 9 namespace cc {
12 10
13 namespace { 11 namespace {
14 12
15 template <class Keyframe> 13 template <class Keyframe>
16 void insertKeyframe(scoped_ptr<Keyframe> keyframe, ScopedPtrVector<Keyframe>& ke yframes) 14 void insertKeyframe(scoped_ptr<Keyframe> keyframe, ScopedPtrVector<Keyframe>& ke yframes)
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 212
215 double progress = (t - m_keyframes[i]->time()) / (m_keyframes[i+1]->time() - m_keyframes[i]->time()); 213 double progress = (t - m_keyframes[i]->time()) / (m_keyframes[i+1]->time() - m_keyframes[i]->time());
216 214
217 if (m_keyframes[i]->timingFunction()) 215 if (m_keyframes[i]->timingFunction())
218 progress = m_keyframes[i]->timingFunction()->getValue(progress); 216 progress = m_keyframes[i]->timingFunction()->getValue(progress);
219 217
220 return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress); 218 return m_keyframes[i+1]->value().blend(m_keyframes[i]->value(), progress);
221 } 219 }
222 220
223 } // namespace cc 221 } // namespace cc
OLDNEW
« no previous file with comments | « cc/io_surface_layer_impl.cc ('k') | cc/keyframed_animation_curve_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698