| 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 "cc/test/animation_test_common.h" | 7 #include "cc/test/animation_test_common.h" |
| 8 | 8 |
| 9 #include "CCKeyframedAnimationCurve.h" | 9 #include "CCKeyframedAnimationCurve.h" |
| 10 #include "CCLayerAnimationController.h" | 10 #include "CCLayerAnimationController.h" |
| 11 #include "CCLayerImpl.h" | 11 #include "CCLayerImpl.h" |
| 12 #include "LayerChromium.h" | 12 #include "cc/layer.h" |
| 13 #include <public/WebTransformOperations.h> | 13 #include <public/WebTransformOperations.h> |
| 14 | 14 |
| 15 using namespace cc; | 15 using namespace cc; |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 template <class Target> | 19 template <class Target> |
| 20 void addOpacityTransition(Target& target, double duration, float startOpacity, f
loat endOpacity, bool useTimingFunction) | 20 void addOpacityTransition(Target& target, double duration, float startOpacity, f
loat endOpacity, bool useTimingFunction) |
| 21 { | 21 { |
| 22 scoped_ptr<CCKeyframedFloatAnimationCurve> curve(CCKeyframedFloatAnimationCu
rve::create()); | 22 scoped_ptr<CCKeyframedFloatAnimationCurve> curve(CCKeyframedFloatAnimationCu
rve::create()); |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 { | 201 { |
| 202 addAnimatedTransform(layer, duration, deltaX, deltaY); | 202 addAnimatedTransform(layer, duration, deltaX, deltaY); |
| 203 } | 203 } |
| 204 | 204 |
| 205 void addAnimatedTransformToLayer(cc::CCLayerImpl& layer, double duration, int de
ltaX, int deltaY) | 205 void addAnimatedTransformToLayer(cc::CCLayerImpl& layer, double duration, int de
ltaX, int deltaY) |
| 206 { | 206 { |
| 207 addAnimatedTransform(*layer.layerAnimationController(), duration, deltaX, de
ltaY); | 207 addAnimatedTransform(*layer.layerAnimationController(), duration, deltaX, de
ltaY); |
| 208 } | 208 } |
| 209 | 209 |
| 210 } // namespace WebKitTests | 210 } // namespace WebKitTests |
| OLD | NEW |