Index: cc/test/animation_test_common.cc |
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc |
index f61e9bbc5ce96384012935e63d3ab75668e3c601..50f477881bdf81a39692a19ad0dfdc4a58f3248d 100644 |
--- a/cc/test/animation_test_common.cc |
+++ b/cc/test/animation_test_common.cc |
@@ -47,7 +47,7 @@ int AddOpacityTransition(Target* target, |
scoped_ptr<Animation> animation(Animation::Create( |
std::move(curve), id, AnimationIdProvider::NextGroupId(), |
- Animation::OPACITY)); |
+ AnimationTargetProperty::OPACITY)); |
animation->set_needs_synchronized_start_time(true); |
target->AddAnimation(std::move(animation)); |
@@ -74,7 +74,7 @@ int AddAnimatedTransform(Target* target, |
scoped_ptr<Animation> animation(Animation::Create( |
std::move(curve), id, AnimationIdProvider::NextGroupId(), |
- Animation::TRANSFORM)); |
+ AnimationTargetProperty::TRANSFORM)); |
animation->set_needs_synchronized_start_time(true); |
target->AddAnimation(std::move(animation)); |
@@ -119,9 +119,9 @@ int AddAnimatedFilter(Target* target, |
int id = AnimationIdProvider::NextAnimationId(); |
- scoped_ptr<Animation> animation( |
- Animation::Create(std::move(curve), id, |
- AnimationIdProvider::NextGroupId(), Animation::FILTER)); |
+ scoped_ptr<Animation> animation(Animation::Create( |
+ std::move(curve), id, AnimationIdProvider::NextGroupId(), |
+ AnimationTargetProperty::FILTER)); |
animation->set_needs_synchronized_start_time(true); |
target->AddAnimation(std::move(animation)); |
@@ -417,7 +417,7 @@ int AddOpacityStepsToController(LayerAnimationController* target, |
scoped_ptr<Animation> animation(Animation::Create( |
std::move(curve), id, AnimationIdProvider::NextGroupId(), |
- Animation::OPACITY)); |
+ AnimationTargetProperty::OPACITY)); |
animation->set_needs_synchronized_start_time(true); |
target->AddAnimation(std::move(animation)); |
@@ -528,7 +528,7 @@ int AddOpacityTransitionToLayerWithPlayer( |
void AbortAnimationsOnLayerWithPlayer( |
int layer_id, |
scoped_refptr<AnimationTimeline> timeline, |
- Animation::TargetProperty target_property) { |
+ AnimationTargetProperty::Enum target_property) { |
LayerAnimationController* controller = |
timeline->animation_host()->GetControllerForLayerId(layer_id); |
DCHECK(controller); |