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

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

Issue 11312181: cc: Remove the remaining using-directives of namespace cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | cc/test/layer_tree_test_common.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 "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"
11 #include <public/WebTransformOperations.h> 11 #include <public/WebTransformOperations.h>
12 12
13 using namespace cc; 13 using cc::ActiveAnimation;
14 using cc::AnimationCurve;
15 using cc::EaseTimingFunction;
16 using cc::FloatKeyframe;
17 using cc::KeyframedFloatAnimationCurve;
18 using cc::KeyframedTransformAnimationCurve;
19 using cc::TimingFunction;
20 using cc::TransformKeyframe;
14 21
15 namespace { 22 namespace {
16 23
17 static int nextAnimationId = 0; 24 static int nextAnimationId = 0;
18 25
19 template <class Target> 26 template <class Target>
20 int addOpacityTransition(Target& target, double duration, float startOpacity, fl oat endOpacity, bool useTimingFunction) 27 int addOpacityTransition(Target& target, double duration, float startOpacity, fl oat endOpacity, bool useTimingFunction)
21 { 28 {
22 scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve: :create()); 29 scoped_ptr<KeyframedFloatAnimationCurve> curve(KeyframedFloatAnimationCurve: :create());
23 30
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 { 213 {
207 return addAnimatedTransform(layer, duration, deltaX, deltaY); 214 return addAnimatedTransform(layer, duration, deltaX, deltaY);
208 } 215 }
209 216
210 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)
211 { 218 {
212 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY); 219 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY);
213 } 220 }
214 221
215 } // namespace WebKitTests 222 } // namespace WebKitTests
OLDNEW
« no previous file with comments | « no previous file | cc/test/layer_tree_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698