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

Unified Diff: cc/animation/animation_player.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/animation/animation_player.cc
diff --git a/cc/animation/animation_player.cc b/cc/animation/animation_player.cc
index 52fa9a8dec724711a6d7d1df482da7341fc452f8..ec6628cdf1a255cdd947bb146dc261a088fe04f6 100644
--- a/cc/animation/animation_player.cc
+++ b/cc/animation/animation_player.cc
@@ -119,7 +119,8 @@ void AnimationPlayer::UnbindElementAnimations() {
}
void AnimationPlayer::AddAnimation(scoped_ptr<Animation> animation) {
- DCHECK(animation->target_property() != Animation::SCROLL_OFFSET ||
+ DCHECK(animation->target_property() !=
+ AnimationTargetProperty::SCROLL_OFFSET ||
(animation_host_ && animation_host_->SupportsScrollAnimations()));
if (element_animations_) {
@@ -160,8 +161,7 @@ void AnimationPlayer::AbortAnimation(int animation_id) {
SetNeedsCommit();
}
-void AnimationPlayer::AbortAnimations(
- Animation::TargetProperty target_property) {
+void AnimationPlayer::AbortAnimations(AnimationTargetProperty target_property) {
if (element_animations_) {
element_animations_->layer_animation_controller()->AbortAnimations(
target_property);
@@ -187,7 +187,7 @@ void AnimationPlayer::PushPropertiesTo(AnimationPlayer* player_impl) {
void AnimationPlayer::NotifyAnimationStarted(
base::TimeTicks monotonic_time,
- Animation::TargetProperty target_property,
+ AnimationTargetProperty target_property,
int group) {
if (layer_animation_delegate_)
layer_animation_delegate_->NotifyAnimationStarted(monotonic_time,
@@ -196,7 +196,7 @@ void AnimationPlayer::NotifyAnimationStarted(
void AnimationPlayer::NotifyAnimationFinished(
base::TimeTicks monotonic_time,
- Animation::TargetProperty target_property,
+ AnimationTargetProperty target_property,
int group) {
if (layer_animation_delegate_)
layer_animation_delegate_->NotifyAnimationFinished(monotonic_time,
@@ -205,7 +205,7 @@ void AnimationPlayer::NotifyAnimationFinished(
void AnimationPlayer::NotifyAnimationAborted(
base::TimeTicks monotonic_time,
- Animation::TargetProperty target_property,
+ AnimationTargetProperty target_property,
int group) {
if (layer_animation_delegate_)
layer_animation_delegate_->NotifyAnimationAborted(monotonic_time,

Powered by Google App Engine
This is Rietveld 408576698