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

Side by Side Diff: ui/compositor/layer_animation_sequence_unittest.cc

Issue 11087093: Migrate ui::Transform to gfx::Transform (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Should pass trybots this time Created 8 years, 2 months 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
« no previous file with comments | « ui/compositor/layer_animation_element_unittest.cc ('k') | ui/compositor/layer_animator.h » ('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 (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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 sequence.AddElement( 70 sequence.AddElement(
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 Transform start_transform, target_transform, middle_transform; 80 gfx::Transform start_transform, target_transform, middle_transform;
81 start_transform.SetRotate(-90); 81 start_transform.SetRotate(-90);
82 target_transform.SetRotate(90); 82 target_transform.SetRotate(90);
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
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ui/compositor/layer_animation_element_unittest.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698