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

Unified Diff: ui/compositor/layer_animation_element_unittest.cc

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/layer_animation_element.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_element_unittest.cc
diff --git a/ui/compositor/layer_animation_element_unittest.cc b/ui/compositor/layer_animation_element_unittest.cc
index 153f1df64b66b47fd2579892f85c6d50a28c0b95..8871a2c9f5efee4c33741bd79e6c792c3de433e1 100644
--- a/ui/compositor/layer_animation_element_unittest.cc
+++ b/ui/compositor/layer_animation_element_unittest.cc
@@ -366,7 +366,7 @@ TEST(LayerAnimationElementTest, AbortOpacityElement) {
LayerAnimationElement::CreateOpacityElement(target, delta));
// Choose a non-linear Tween type.
- Tween::Type tween_type = Tween::EASE_IN;
+ gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
element->set_tween_type(tween_type);
delegate.SetOpacityFromAnimation(start);
@@ -387,7 +387,7 @@ TEST(LayerAnimationElementTest, AbortOpacityElement) {
// Since the element has started, it should update the delegate when
// aborted.
element->Abort(&delegate);
- EXPECT_FLOAT_EQ(Tween::CalculateValue(tween_type, 0.5),
+ EXPECT_FLOAT_EQ(gfx::Tween::CalculateValue(tween_type, 0.5),
delegate.GetOpacityForAnimation());
}
@@ -405,7 +405,7 @@ TEST(LayerAnimationElementTest, AbortTransformElement) {
LayerAnimationElement::CreateTransformElement(target_transform, delta));
// Choose a non-linear Tween type.
- Tween::Type tween_type = Tween::EASE_IN;
+ gfx::Tween::Type tween_type = gfx::Tween::EASE_IN;
element->set_tween_type(tween_type);
delegate.SetTransformFromAnimation(start_transform);
@@ -427,7 +427,7 @@ TEST(LayerAnimationElementTest, AbortTransformElement) {
// aborted.
element->Abort(&delegate);
target_transform.Blend(start_transform,
- Tween::CalculateValue(tween_type, 0.5));
+ gfx::Tween::CalculateValue(tween_type, 0.5));
CheckApproximatelyEqual(target_transform,
delegate.GetTransformForAnimation());
}
« no previous file with comments | « ui/compositor/layer_animation_element.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698