cc: Move filters to the effect tree

cc/trees/layer_tree_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 530 matching lines @@
 
 void LayerTreeImpl::AddToOpacityAnimationsMap(int id, float opacity) {
   opacity_animations_map_[id] = opacity;
 }
 
 void LayerTreeImpl::AddToTransformAnimationsMap(int id,
                                                 gfx::Transform transform) {
   transform_animations_map_[id] = transform;
 }
 
+void LayerTreeImpl::AddToFilterAnimationsMap(int id,
+                                             const FilterOperations& filters) {
+  filter_animations_map_[id] = filters;
+}
+
 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const {
   return InnerViewportScrollLayer()
              ? InnerViewportScrollLayer()->scroll_clip_layer()
              : NULL;
 }
 
 LayerImpl* LayerTreeImpl::OuterViewportContainerLayer() const {
   return OuterViewportScrollLayer()
              ? OuterViewportScrollLayer()->scroll_clip_layer()
              : NULL;
@@ skipping 86 matching lines @@
         layer_ids_to_remove.push_back(id);
         continue;
       }
       node->local = layer_id_to_transform.second;
       node->needs_local_transform_update = true;
       property_trees_.transform_tree.set_needs_update(true);
     }
   }
   for (auto id : layer_ids_to_remove)
     transform_animations_map_.erase(id);
+  layer_ids_to_remove.clear();
+
+  for (auto& layer_id_to_filters : filter_animations_map_) {
+    const int id = layer_id_to_filters.first;
+    if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id)) {
+      EffectNode* node = property_trees_.effect_tree.Node(
+          property_trees_.effect_id_to_index_map[id]);
+      if (!node->is_currently_animating_filter ||
+          node->filters == layer_id_to_filters.second) {
+        layer_ids_to_remove.push_back(id);
+        continue;
+      }
+      node->filters = layer_id_to_filters.second;
+      property_trees_.effect_tree.set_needs_update(true);
+    }
+  }
+  for (auto id : layer_ids_to_remove)
+    filter_animations_map_.erase(id);
 
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, [](LayerImpl* layer) {
     layer->UpdatePropertyTreeForScrollingAndAnimationIfNeeded();
   });
 }
 
 void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {
   DCHECK(IsActiveTree());
   if (page_scale_factor()->SetCurrent(
           ClampPageScaleFactorToLimits(active_page_scale))) {
@@ skipping 1359 matching lines @@
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   // Iterate over all layers, including masks and replicas.
   for (auto& layer : *layers_)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc