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

Side by Side Diff: cc/test/animation_test_common.cc

Issue 11348371: cc: Move WebCompositorOutputSurface and related classes into cc/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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
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 "cc/test/animation_test_common.h" 5 #include "cc/test/animation_test_common.h"
6 6
7 #include "cc/keyframed_animation_curve.h" 7 #include "cc/keyframed_animation_curve.h"
8 #include "cc/layer.h" 8 #include "cc/layer.h"
9 #include "cc/layer_animation_controller.h" 9 #include "cc/layer_animation_controller.h"
10 #include "cc/layer_impl.h" 10 #include "cc/layer_impl.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<A nimationCurve>(), id, 0, ActiveAnimation::Transform)); 64 scoped_ptr<ActiveAnimation> animation(ActiveAnimation::create(curve.PassAs<A nimationCurve>(), id, 0, ActiveAnimation::Transform));
65 animation->setNeedsSynchronizedStartTime(true); 65 animation->setNeedsSynchronizedStartTime(true);
66 66
67 target.addAnimation(animation.Pass()); 67 target.addAnimation(animation.Pass());
68 return id; 68 return id;
69 } 69 }
70 70
71 } // namespace 71 } // namespace
72 72
73 namespace WebKitTests { 73 namespace cc {
74 74
75 FakeFloatAnimationCurve::FakeFloatAnimationCurve() 75 FakeFloatAnimationCurve::FakeFloatAnimationCurve()
76 : m_duration(1) 76 : m_duration(1)
77 { 77 {
78 } 78 }
79 79
80 FakeFloatAnimationCurve::FakeFloatAnimationCurve(double duration) 80 FakeFloatAnimationCurve::FakeFloatAnimationCurve(double duration)
81 : m_duration(duration) 81 : m_duration(duration)
82 { 82 {
83 } 83 }
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i nt deltaY) 212 int addAnimatedTransformToLayer(cc::Layer& layer, double duration, int deltaX, i nt deltaY)
213 { 213 {
214 return addAnimatedTransform(layer, duration, deltaX, deltaY); 214 return addAnimatedTransform(layer, duration, deltaX, deltaY);
215 } 215 }
216 216
217 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta X, int deltaY) 217 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta X, int deltaY)
218 { 218 {
219 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY); 219 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY);
220 } 220 }
221 221
222 } // namespace WebKitTests 222 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698