| Index: cc/trees/layer_tree_impl.cc
|
| diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
|
| index bfb276a0f8ae4e2eb7fd6d3b60ab90b18e33245c..c466e50843bc8f6cc64c95659bcd3687e707f97f 100644
|
| --- a/cc/trees/layer_tree_impl.cc
|
| +++ b/cc/trees/layer_tree_impl.cc
|
| @@ -642,16 +642,36 @@ void LayerTreeImpl::AddToOpacityAnimationsMap(int id, float opacity) {
|
| element_id_to_opacity_animations_[layer->element_id()] = opacity;
|
| }
|
|
|
| -void LayerTreeImpl::AddToTransformAnimationsMap(int id,
|
| - gfx::Transform transform) {
|
| - if (LayerImpl* layer = LayerById(id))
|
| - element_id_to_transform_animations_[layer->element_id()] = transform;
|
| +void LayerTreeImpl::SetTransformMutated(ElementId element_id,
|
| + const gfx::Transform& transform) {
|
| + DCHECK_EQ(1u, property_trees()->element_id_to_transform_node_index.count(
|
| + element_id));
|
| + element_id_to_transform_animations_[element_id] = transform;
|
| + if (!property_trees()->transform_tree.OnTransformAnimated(element_id,
|
| + transform))
|
| + return;
|
| +
|
| + if (LayerImpl* layer = LayerByElementId(element_id))
|
| + layer->set_was_ever_ready_since_last_transform_animation(false);
|
| +
|
| + set_needs_update_draw_properties();
|
| +}
|
| +
|
| +void LayerTreeImpl::SetOpacityMutated(ElementId element_id, float opacity) {
|
| + DCHECK_EQ(
|
| + 1u, property_trees()->element_id_to_effect_node_index.count(element_id));
|
| + element_id_to_opacity_animations_[element_id] = opacity;
|
| + if (property_trees()->effect_tree.OnOpacityAnimated(element_id, opacity))
|
| + set_needs_update_draw_properties();
|
| }
|
|
|
| -void LayerTreeImpl::AddToFilterAnimationsMap(int id,
|
| - const FilterOperations& filters) {
|
| - if (LayerImpl* layer = LayerById(id))
|
| - element_id_to_filter_animations_[layer->element_id()] = filters;
|
| +void LayerTreeImpl::SetFilterMutated(ElementId element_id,
|
| + const FilterOperations& filters) {
|
| + DCHECK_EQ(
|
| + 1u, property_trees()->element_id_to_effect_node_index.count(element_id));
|
| + element_id_to_filter_animations_[element_id] = filters;
|
| + if (property_trees()->effect_tree.OnFilterAnimated(element_id, filters))
|
| + set_needs_update_draw_properties();
|
| }
|
|
|
| LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const {
|
|
|