| Index: cc/trees/layer_tree_host_common_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
|
| index 2c97d1227cd95ada52577feb4ab9af38e4442552..a91ec9238b9c3fd22d7d02b1ac2ab52c7a83be66 100644
|
| --- a/cc/trees/layer_tree_host_common_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_common_unittest.cc
|
| @@ -2626,7 +2626,7 @@ TEST_F(LayerTreeHostCommonTest,
|
| // Add a transform animation with a start delay to |grand_child|.
|
| scoped_ptr<Animation> animation = Animation::Create(
|
| scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)), 0, 1,
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| animation->set_fill_mode(Animation::FILL_MODE_NONE);
|
| animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000));
|
| if (layer_settings().use_compositor_animation_timelines) {
|
| @@ -7553,18 +7553,18 @@ TEST_F(LayerTreeHostCommonTest, MaximumAnimationScaleFactor) {
|
|
|
| if (layer_settings().use_compositor_animation_timelines) {
|
| AbortAnimationsOnLayerWithPlayer(grand_parent->id(), timeline,
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| AbortAnimationsOnLayerWithPlayer(parent_raw->id(), timeline,
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| AbortAnimationsOnLayerWithPlayer(child_raw->id(), timeline,
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| } else {
|
| grand_parent->layer_animation_controller()->AbortAnimations(
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| parent_raw->layer_animation_controller()->AbortAnimations(
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| child_raw->layer_animation_controller()->AbortAnimations(
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| }
|
|
|
| TransformOperations perspective;
|
| @@ -7602,10 +7602,10 @@ TEST_F(LayerTreeHostCommonTest, MaximumAnimationScaleFactor) {
|
|
|
| if (layer_settings().use_compositor_animation_timelines) {
|
| AbortAnimationsOnLayerWithPlayer(child_raw->id(), timeline,
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| } else {
|
| child_raw->layer_animation_controller()->AbortAnimations(
|
| - Animation::TRANSFORM);
|
| + AnimationTargetProperty::TRANSFORM);
|
| }
|
| gfx::Transform scale_matrix;
|
| scale_matrix.Scale(1.f, 2.f);
|
| @@ -8521,8 +8521,8 @@ TEST_F(LayerTreeHostCommonTest, DelayedFilterAnimationCreatesRenderSurface) {
|
| FilterKeyframe::Create(base::TimeDelta(), start_filters, nullptr));
|
| curve->AddKeyframe(FilterKeyframe::Create(
|
| base::TimeDelta::FromMilliseconds(100), end_filters, nullptr));
|
| - scoped_ptr<Animation> animation =
|
| - Animation::Create(std::move(curve), 0, 1, Animation::FILTER);
|
| + scoped_ptr<Animation> animation = Animation::Create(
|
| + std::move(curve), 0, 1, AnimationTargetProperty::FILTER);
|
| animation->set_fill_mode(Animation::FILL_MODE_NONE);
|
| animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000));
|
|
|
| @@ -9003,7 +9003,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {
|
| int animation_id = 0;
|
| scoped_ptr<Animation> animation = Animation::Create(
|
| scoped_ptr<AnimationCurve>(new FakeTransformTransition(1.0)),
|
| - animation_id, 1, Animation::TRANSFORM);
|
| + animation_id, 1, AnimationTargetProperty::TRANSFORM);
|
| animation->set_fill_mode(Animation::FILL_MODE_NONE);
|
| animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000));
|
| if (layer_settings().use_compositor_animation_timelines) {
|
| @@ -9040,7 +9040,7 @@ TEST_F(LayerTreeHostCommonTest, SkippingSubtreeMain) {
|
| animation_id = 1;
|
| animation = Animation::Create(
|
| scoped_ptr<AnimationCurve>(new FakeFloatTransition(1.0, 0.f, 1.f)),
|
| - animation_id, 1, Animation::OPACITY);
|
| + animation_id, 1, AnimationTargetProperty::OPACITY);
|
| animation->set_fill_mode(Animation::FILL_MODE_NONE);
|
| animation->set_time_offset(base::TimeDelta::FromMilliseconds(-1000));
|
| if (layer_settings().use_compositor_animation_timelines) {
|
|
|