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 "cc/test/animation_test_common.h" | 5 #include "cc/test/animation_test_common.h" |
6 | 6 |
7 #include "cc/animation/animation_id_provider.h" | 7 #include "cc/animation/animation_id_provider.h" |
8 #include "cc/animation/keyframed_animation_curve.h" | 8 #include "cc/animation/keyframed_animation_curve.h" |
9 #include "cc/animation/layer_animation_controller.h" | 9 #include "cc/animation/layer_animation_controller.h" |
10 #include "cc/animation/transform_operations.h" | 10 #include "cc/animation/transform_operations.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 | 162 |
163 bool FakeTransformTransition::AnimatedBoundsForBox(const gfx::BoxF& box, | 163 bool FakeTransformTransition::AnimatedBoundsForBox(const gfx::BoxF& box, |
164 gfx::BoxF* bounds) const { | 164 gfx::BoxF* bounds) const { |
165 return false; | 165 return false; |
166 } | 166 } |
167 | 167 |
168 bool FakeTransformTransition::AffectsScale() const { return false; } | 168 bool FakeTransformTransition::AffectsScale() const { return false; } |
169 | 169 |
170 bool FakeTransformTransition::IsTranslation() const { return true; } | 170 bool FakeTransformTransition::IsTranslation() const { return true; } |
171 | 171 |
172 bool FakeTransformTransition::MaximumScale(float* max_scale) const { | 172 bool FakeTransformTransition::MaximumTargetScale(bool forward_direction, |
| 173 float* max_scale) const { |
173 *max_scale = 1.f; | 174 *max_scale = 1.f; |
174 return true; | 175 return true; |
175 } | 176 } |
176 | 177 |
177 scoped_ptr<AnimationCurve> FakeTransformTransition::Clone() const { | 178 scoped_ptr<AnimationCurve> FakeTransformTransition::Clone() const { |
178 return make_scoped_ptr(new FakeTransformTransition(*this)); | 179 return make_scoped_ptr(new FakeTransformTransition(*this)); |
179 } | 180 } |
180 | 181 |
181 | 182 |
182 FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) | 183 FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 double duration, | 341 double duration, |
341 float start_brightness, | 342 float start_brightness, |
342 float end_brightness) { | 343 float end_brightness) { |
343 return AddAnimatedFilter(layer->layer_animation_controller(), | 344 return AddAnimatedFilter(layer->layer_animation_controller(), |
344 duration, | 345 duration, |
345 start_brightness, | 346 start_brightness, |
346 end_brightness); | 347 end_brightness); |
347 } | 348 } |
348 | 349 |
349 } // namespace cc | 350 } // namespace cc |
OLD | NEW |