| Index: cc/trees/layer_tree_host_impl.cc
|
| diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
|
| index 218bc825bf6ef35ff9504e3157922dfa469449fe..ee7a3ed9a408a7b029ecfd459967462a5a39ffab 100644
|
| --- a/cc/trees/layer_tree_host_impl.cc
|
| +++ b/cc/trees/layer_tree_host_impl.cc
|
| @@ -644,7 +644,7 @@ void LayerTreeHostImpl::TrackDamageForAllSurfaces(
|
| render_surface->layer_list(), render_surface,
|
| render_surface->SurfacePropertyChangedOnlyFromDescendant(),
|
| render_surface->content_rect(), render_surface->MaskLayer(),
|
| - render_surface_layer->filters());
|
| + render_surface->Filters());
|
| }
|
| }
|
|
|
| @@ -4005,6 +4005,32 @@ void LayerTreeHostImpl::ElementOpacityIsAnimatingChanged(
|
| }
|
| }
|
|
|
| +void LayerTreeHostImpl::ElementFilterIsAnimatingChanged(
|
| + ElementId element_id,
|
| + ElementListType list_type,
|
| + AnimationChangeType change_type,
|
| + bool is_animating) {
|
| + LayerTreeImpl* tree =
|
| + list_type == ElementListType::ACTIVE ? active_tree() : pending_tree();
|
| + if (!tree)
|
| + return;
|
| + LayerImpl* layer = tree->LayerByElementId(element_id);
|
| + if (layer) {
|
| + switch (change_type) {
|
| + case AnimationChangeType::POTENTIAL:
|
| + layer->OnFilterIsPotentiallyAnimatingChanged(is_animating);
|
| + break;
|
| + case AnimationChangeType::RUNNING:
|
| + layer->OnFilterIsCurrentlyAnimatingChanged(is_animating);
|
| + break;
|
| + case AnimationChangeType::BOTH:
|
| + layer->OnFilterIsPotentiallyAnimatingChanged(is_animating);
|
| + layer->OnFilterIsCurrentlyAnimatingChanged(is_animating);
|
| + break;
|
| + }
|
| + }
|
| +}
|
| +
|
| void LayerTreeHostImpl::ScrollOffsetAnimationFinished() {
|
| // TODO(majidvp): We should pass in the original starting scroll position here
|
| ScrollStateData scroll_state_data;
|
|
|