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

Unified Diff: cc/layers/layer_unittest.cc

Issue 1698813002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use custom hash in unordered_set. Created 4 years, 10 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
Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index f9904c0909196616d1b88478a99956f65ed7f667..5ade6f7397b6bcb9ee19d1cdd7abfe778d699ec1 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -1565,7 +1565,7 @@ TEST_F(LayerTest,
AddAnimatedTransformToController(impl_layer->layer_animation_controller(),
1.0, 0, 100);
impl_layer->layer_animation_controller()
- ->GetAnimation(Animation::TRANSFORM)
+ ->GetAnimation(AnimationTargetProperty::TRANSFORM)
->set_is_impl_only(true);
}
transform.Rotate(45.0);
@@ -1615,7 +1615,7 @@ TEST_F(LayerTest,
AddOpacityTransitionToController(impl_layer->layer_animation_controller(),
1.0, 0.3f, 0.7f, false);
impl_layer->layer_animation_controller()
- ->GetAnimation(Animation::OPACITY)
+ ->GetAnimation(AnimationTargetProperty::OPACITY)
->set_is_impl_only(true);
}
EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetOpacity(0.75f));
@@ -1666,7 +1666,7 @@ TEST_F(LayerTest,
AddAnimatedFilterToController(impl_layer->layer_animation_controller(), 1.0,
1.f, 2.f);
impl_layer->layer_animation_controller()
- ->GetAnimation(Animation::FILTER)
+ ->GetAnimation(AnimationTargetProperty::FILTER)
->set_is_impl_only(true);
}
filters.Append(FilterOperation::CreateSepiaFilter(0.5f));
@@ -1999,8 +1999,8 @@ static bool AddTestAnimation(Layer* layer) {
curve->AddKeyframe(FloatKeyframe::Create(base::TimeDelta(), 0.3f, nullptr));
curve->AddKeyframe(
FloatKeyframe::Create(base::TimeDelta::FromSecondsD(1.0), 0.7f, nullptr));
- scoped_ptr<Animation> animation =
- Animation::Create(std::move(curve), 0, 0, Animation::OPACITY);
+ scoped_ptr<Animation> animation = Animation::Create(
+ std::move(curve), 0, 0, AnimationTargetProperty::OPACITY);
return layer->AddAnimation(std::move(animation));
}

Powered by Google App Engine
This is Rietveld 408576698