| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "ui/compositor/layer_animation_sequence.h" | 5 #include "ui/compositor/layer_animation_sequence.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 LayerAnimationElement::CreateOpacityElement(target_opacity, delta)); | 71 LayerAnimationElement::CreateOpacityElement(target_opacity, delta)); |
| 72 | 72 |
| 73 // Pause bounds for a second. | 73 // Pause bounds for a second. |
| 74 LayerAnimationElement::AnimatableProperties properties; | 74 LayerAnimationElement::AnimatableProperties properties; |
| 75 properties.insert(LayerAnimationElement::BOUNDS); | 75 properties.insert(LayerAnimationElement::BOUNDS); |
| 76 | 76 |
| 77 sequence.AddElement( | 77 sequence.AddElement( |
| 78 LayerAnimationElement::CreatePauseElement(properties, delta)); | 78 LayerAnimationElement::CreatePauseElement(properties, delta)); |
| 79 | 79 |
| 80 gfx::Transform start_transform, target_transform, middle_transform; | 80 gfx::Transform start_transform, target_transform, middle_transform; |
| 81 start_transform.SetRotate(-90); | 81 start_transform.Rotate(-30.0); |
| 82 target_transform.SetRotate(90); | 82 target_transform.Rotate(30.0); |
| 83 | 83 |
| 84 sequence.AddElement( | 84 sequence.AddElement( |
| 85 LayerAnimationElement::CreateTransformElement(target_transform, delta)); | 85 LayerAnimationElement::CreateTransformElement(target_transform, delta)); |
| 86 | 86 |
| 87 for (int i = 0; i < 2; ++i) { | 87 for (int i = 0; i < 2; ++i) { |
| 88 delegate.SetOpacityFromAnimation(start_opacity); | 88 delegate.SetOpacityFromAnimation(start_opacity); |
| 89 delegate.SetTransformFromAnimation(start_transform); | 89 delegate.SetTransformFromAnimation(start_transform); |
| 90 | 90 |
| 91 sequence.Progress(base::TimeDelta::FromMilliseconds(0), &delegate); | 91 sequence.Progress(base::TimeDelta::FromMilliseconds(0), &delegate); |
| 92 EXPECT_FLOAT_EQ(start_opacity, delegate.GetOpacityForAnimation()); | 92 EXPECT_FLOAT_EQ(start_opacity, delegate.GetOpacityForAnimation()); |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 EXPECT_TRUE(!observer.last_ended_sequence()); | 188 EXPECT_TRUE(!observer.last_ended_sequence()); |
| 189 sequence.Progress(delta, &delegate); | 189 sequence.Progress(delta, &delegate); |
| 190 EXPECT_EQ(observer.last_ended_sequence(), &sequence); | 190 EXPECT_EQ(observer.last_ended_sequence(), &sequence); |
| 191 sequence.RemoveObserver(&observer); | 191 sequence.RemoveObserver(&observer); |
| 192 } | 192 } |
| 193 } | 193 } |
| 194 | 194 |
| 195 } // namespace | 195 } // namespace |
| 196 | 196 |
| 197 } // namespace ui | 197 } // namespace ui |
| OLD | NEW |