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

Unified Diff: cc/test/animation_test_common.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/test/animation_test_common.cc
diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc
index f61e9bbc5ce96384012935e63d3ab75668e3c601..cfbae87a3901de582cd39afebcb52a95cb2e2d33 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));
@@ -525,10 +525,9 @@ int AddOpacityTransitionToLayerWithPlayer(
end_opacity, use_timing_function);
}
-void AbortAnimationsOnLayerWithPlayer(
- int layer_id,
- scoped_refptr<AnimationTimeline> timeline,
- Animation::TargetProperty target_property) {
+void AbortAnimationsOnLayerWithPlayer(int layer_id,
+ scoped_refptr<AnimationTimeline> timeline,
+ AnimationTargetProperty target_property) {
LayerAnimationController* controller =
timeline->animation_host()->GetControllerForLayerId(layer_id);
DCHECK(controller);

Powered by Google App Engine
This is Rietveld 408576698