| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index 4d6ec7072fc88a60f6fc56c95ab1bbeca193761b..28f904a3e680bc304eafd7ca093501b44afe4f0d 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -1985,122 +1985,6 @@ LayerTreeImpl::TakePendingPageScaleAnimation() {
|
| return std::move(pending_page_scale_animation_);
|
| }
|
|
|
| -bool LayerTreeImpl::IsAnimatingFilterProperty(const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->IsAnimatingFilterProperty(
|
| - layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::IsAnimatingOpacityProperty(const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->IsAnimatingOpacityProperty(
|
| - layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::IsAnimatingTransformProperty(const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->IsAnimatingTransformProperty(
|
| - layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasPotentiallyRunningFilterAnimation(
|
| - const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasPotentiallyRunningFilterAnimation(layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasPotentiallyRunningOpacityAnimation(
|
| - const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasPotentiallyRunningOpacityAnimation(layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasPotentiallyRunningTransformAnimation(
|
| - const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasPotentiallyRunningTransformAnimation(layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasAnyAnimationTargetingProperty(
|
| - const LayerImpl* layer,
|
| - TargetProperty::Type property) const {
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasAnyAnimationTargetingProperty(layer->element_id(), property);
|
| -}
|
| -
|
| -bool LayerTreeImpl::AnimationsPreserveAxisAlignment(
|
| - const LayerImpl* layer) const {
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->AnimationsPreserveAxisAlignment(layer->element_id());
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasOnlyTranslationTransforms(const LayerImpl* layer) const {
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->HasOnlyTranslationTransforms(
|
| - layer->element_id(), list_type);
|
| -}
|
| -
|
| -bool LayerTreeImpl::MaximumTargetScale(const LayerImpl* layer,
|
| - float* max_scale) const {
|
| - *max_scale = 0.f;
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->MaximumTargetScale(
|
| - layer->element_id(), list_type, max_scale);
|
| -}
|
| -
|
| -bool LayerTreeImpl::AnimationStartScale(const LayerImpl* layer,
|
| - float* start_scale) const {
|
| - *start_scale = 0.f;
|
| - ElementListType list_type =
|
| - IsActiveTree() ? ElementListType::ACTIVE : ElementListType::PENDING;
|
| - return layer_tree_host_impl_->animation_host()->AnimationStartScale(
|
| - layer->element_id(), list_type, start_scale);
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasFilterAnimationThatInflatesBounds(
|
| - const LayerImpl* layer) const {
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasFilterAnimationThatInflatesBounds(layer->element_id());
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasTransformAnimationThatInflatesBounds(
|
| - const LayerImpl* layer) const {
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasTransformAnimationThatInflatesBounds(layer->element_id());
|
| -}
|
| -
|
| -bool LayerTreeImpl::HasAnimationThatInflatesBounds(
|
| - const LayerImpl* layer) const {
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->HasAnimationThatInflatesBounds(layer->element_id());
|
| -}
|
| -
|
| -bool LayerTreeImpl::FilterAnimationBoundsForBox(const LayerImpl* layer,
|
| - const gfx::BoxF& box,
|
| - gfx::BoxF* bounds) const {
|
| - return layer_tree_host_impl_->animation_host()->FilterAnimationBoundsForBox(
|
| - layer->element_id(), box, bounds);
|
| -}
|
| -
|
| -bool LayerTreeImpl::TransformAnimationBoundsForBox(const LayerImpl* layer,
|
| - const gfx::BoxF& box,
|
| - gfx::BoxF* bounds) const {
|
| - *bounds = gfx::BoxF();
|
| - return layer_tree_host_impl_->animation_host()
|
| - ->TransformAnimationBoundsForBox(layer->element_id(), box, bounds);
|
| -}
|
| -
|
| void LayerTreeImpl::ScrollAnimationAbort(bool needs_completion) {
|
| layer_tree_host_impl_->animation_host()->ScrollAnimationAbort(
|
| needs_completion);
|
|
|