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

Unified Diff: cc/layers/layer.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.cc
diff --git a/cc/layers/layer.cc b/cc/layers/layer.cc
index 50c138fd65137f05d89f04144825278516143aff..770212be784377cfa8190aaf7c05c88769fa1582 100644
--- a/cc/layers/layer.cc
+++ b/cc/layers/layer.cc
@@ -506,7 +506,7 @@ bool Layer::FilterIsAnimating() const {
DCHECK(layer_tree_host_);
return layer_animation_controller_
? layer_animation_controller_->IsCurrentlyAnimatingProperty(
- Animation::FILTER,
+ AnimationTargetProperty::FILTER,
LayerAnimationController::ObserverType::ACTIVE)
: layer_tree_host_->IsAnimatingFilterProperty(this);
}
@@ -514,7 +514,8 @@ bool Layer::FilterIsAnimating() const {
bool Layer::HasPotentiallyRunningFilterAnimation() const {
if (layer_animation_controller_) {
return layer_animation_controller_->IsPotentiallyAnimatingProperty(
- Animation::FILTER, LayerAnimationController::ObserverType::ACTIVE);
+ AnimationTargetProperty::FILTER,
+ LayerAnimationController::ObserverType::ACTIVE);
}
return layer_tree_host_->HasPotentiallyRunningFilterAnimation(this);
}
@@ -543,7 +544,7 @@ bool Layer::OpacityIsAnimating() const {
DCHECK(layer_tree_host_);
return layer_animation_controller_
? layer_animation_controller_->IsCurrentlyAnimatingProperty(
- Animation::OPACITY,
+ AnimationTargetProperty::OPACITY,
LayerAnimationController::ObserverType::ACTIVE)
: layer_tree_host_->IsAnimatingOpacityProperty(this);
}
@@ -551,7 +552,8 @@ bool Layer::OpacityIsAnimating() const {
bool Layer::HasPotentiallyRunningOpacityAnimation() const {
if (layer_animation_controller_) {
return layer_animation_controller_->IsPotentiallyAnimatingProperty(
- Animation::OPACITY, LayerAnimationController::ObserverType::ACTIVE);
+ AnimationTargetProperty::OPACITY,
+ LayerAnimationController::ObserverType::ACTIVE);
}
return layer_tree_host_->HasPotentiallyRunningOpacityAnimation(this);
}
@@ -749,7 +751,7 @@ bool Layer::TransformIsAnimating() const {
DCHECK(layer_tree_host_);
return layer_animation_controller_
? layer_animation_controller_->IsCurrentlyAnimatingProperty(
- Animation::TRANSFORM,
+ AnimationTargetProperty::TRANSFORM,
LayerAnimationController::ObserverType::ACTIVE)
: layer_tree_host_->IsAnimatingTransformProperty(this);
}
@@ -757,7 +759,8 @@ bool Layer::TransformIsAnimating() const {
bool Layer::HasPotentiallyRunningTransformAnimation() const {
if (layer_animation_controller_) {
return layer_animation_controller_->IsPotentiallyAnimatingProperty(
- Animation::TRANSFORM, LayerAnimationController::ObserverType::ACTIVE);
+ AnimationTargetProperty::TRANSFORM,
+ LayerAnimationController::ObserverType::ACTIVE);
}
return layer_tree_host_->HasPotentiallyRunningTransformAnimation(this);
}
@@ -787,7 +790,7 @@ bool Layer::AnimationStartScale(float* start_scale) const {
}
bool Layer::HasAnyAnimationTargetingProperty(
- Animation::TargetProperty property) const {
+ AnimationTargetProperty property) const {
if (layer_animation_controller_)
return !!layer_animation_controller_->GetAnimation(property);
@@ -1869,7 +1872,7 @@ bool Layer::AddAnimation(scoped_ptr <Animation> animation) {
if (!layer_animation_controller_->animation_registrar())
return false;
- if (animation->target_property() == Animation::SCROLL_OFFSET &&
+ if (animation->target_property() == AnimationTargetProperty::SCROLL_OFFSET &&
!layer_animation_controller_->animation_registrar()
->supports_scroll_animations())
return false;

Powered by Google App Engine
This is Rietveld 408576698