CC Animation: Expose TargetProperty enum to be aliased in Blink Platform.

cc/layers/layer_impl.cc

Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 69ade49a54d2b4b081afd225b0b191c63568f392..3325e8410ab3d089362b481f9eb0097307812184 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -942,10 +942,10 @@ void LayerImpl::UpdatePropertyTreeForScrollingAndAnimationIfNeeded() {
   if (scrollable())
     UpdatePropertyTreeScrollOffset();
 
-  if (HasAnyAnimationTargetingProperty(Animation::OPACITY))
+  if (HasAnyAnimationTargetingProperty(AnimationTargetProperty::OPACITY))
     UpdatePropertyTreeOpacity();
 
-  if (HasAnyAnimationTargetingProperty(Animation::TRANSFORM)) {
+  if (HasAnyAnimationTargetingProperty(AnimationTargetProperty::TRANSFORM)) {
     UpdatePropertyTreeTransform();
     UpdatePropertyTreeTransformIsAnimated(
         HasPotentiallyRunningTransformAnimation());
@@ -1164,7 +1164,7 @@ bool LayerImpl::FilterIsAnimating() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsCurrentlyAnimatingProperty(
-                   Animation::FILTER, observer_type)
+                   AnimationTargetProperty::FILTER, observer_type)
              : layer_tree_impl_->IsAnimatingFilterProperty(this);
 }
 
@@ -1174,7 +1174,7 @@ bool LayerImpl::HasPotentiallyRunningFilterAnimation() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsPotentiallyAnimatingProperty(
-                   Animation::FILTER, observer_type)
+                   AnimationTargetProperty::FILTER, observer_type)
              : layer_tree_impl_->HasPotentiallyRunningFilterAnimation(this);
 }
 
@@ -1182,8 +1182,8 @@ bool LayerImpl::FilterIsAnimatingOnImplOnly() const {
   if (!layer_animation_controller_)
     return layer_tree_impl_->FilterIsAnimatingOnImplOnly(this);
 
-  Animation* filter_animation =
-      layer_animation_controller_->GetAnimation(Animation::FILTER);
+  Animation* filter_animation = layer_animation_controller_->GetAnimation(
+      AnimationTargetProperty::FILTER);
   return filter_animation && filter_animation->is_impl_only();
 }
 
@@ -1228,7 +1228,7 @@ bool LayerImpl::OpacityIsAnimating() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsCurrentlyAnimatingProperty(
-                   Animation::OPACITY, observer_type)
+                   AnimationTargetProperty::OPACITY, observer_type)
              : layer_tree_impl_->IsAnimatingOpacityProperty(this);
 }
 
@@ -1238,7 +1238,7 @@ bool LayerImpl::HasPotentiallyRunningOpacityAnimation() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsPotentiallyAnimatingProperty(
-                   Animation::OPACITY, observer_type)
+                   AnimationTargetProperty::OPACITY, observer_type)
              : layer_tree_impl_->HasPotentiallyRunningOpacityAnimation(this);
 }
 
@@ -1246,8 +1246,8 @@ bool LayerImpl::OpacityIsAnimatingOnImplOnly() const {
   if (!layer_animation_controller_)
     return layer_tree_impl_->OpacityIsAnimatingOnImplOnly(this);
 
-  Animation* opacity_animation =
-      layer_animation_controller_->GetAnimation(Animation::OPACITY);
+  Animation* opacity_animation = layer_animation_controller_->GetAnimation(
+      AnimationTargetProperty::OPACITY);
   return opacity_animation && opacity_animation->is_impl_only();
 }
 
@@ -1352,7 +1352,7 @@ bool LayerImpl::TransformIsAnimating() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsCurrentlyAnimatingProperty(
-                   Animation::TRANSFORM, observer_type)
+                   AnimationTargetProperty::TRANSFORM, observer_type)
              : layer_tree_impl_->IsAnimatingTransformProperty(this);
 }
 
@@ -1362,7 +1362,7 @@ bool LayerImpl::HasPotentiallyRunningTransformAnimation() const {
                  : LayerAnimationController::ObserverType::PENDING;
   return layer_animation_controller_
              ? layer_animation_controller_->IsPotentiallyAnimatingProperty(
-                   Animation::TRANSFORM, observer_type)
+                   AnimationTargetProperty::TRANSFORM, observer_type)
              : layer_tree_impl_->HasPotentiallyRunningTransformAnimation(this);
 }
 
@@ -1370,8 +1370,8 @@ bool LayerImpl::TransformIsAnimatingOnImplOnly() const {
   if (!layer_animation_controller_)
     return layer_tree_impl_->TransformIsAnimatingOnImplOnly(this);
 
-  Animation* transform_animation =
-      layer_animation_controller_->GetAnimation(Animation::TRANSFORM);
+  Animation* transform_animation = layer_animation_controller_->GetAnimation(
+      AnimationTargetProperty::TRANSFORM);
   return transform_animation && transform_animation->is_impl_only();
 }
 
@@ -1415,7 +1415,7 @@ bool LayerImpl::AnimationStartScale(float* start_scale) const {
 }
 
 bool LayerImpl::HasAnyAnimationTargetingProperty(
-    Animation::TargetProperty property) const {
+    AnimationTargetProperty::Enum property) const {
   if (!layer_animation_controller_)
     return layer_tree_impl_->HasAnyAnimationTargetingProperty(this, property);
 
@@ -1778,9 +1778,9 @@ int LayerImpl::NumDescendantsThatDrawContent() const {
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
-    Animation::TargetProperty target_property,
+    AnimationTargetProperty::Enum target_property,
     int group) {
-  if (target_property == Animation::SCROLL_OFFSET)
+  if (target_property == AnimationTargetProperty::SCROLL_OFFSET)
     layer_tree_impl_->InputScrollAnimationFinished();
 }