cc: Move filters to the effect tree

cc/layers/layer.cc

 // Copyright 2010 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/layers/layer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1126 matching lines @@
   layer->SetTransformTreeIndex(transform_tree_index());
   layer->SetEffectTreeIndex(effect_tree_index());
   layer->SetClipTreeIndex(clip_tree_index());
   layer->SetScrollTreeIndex(scroll_tree_index());
   layer->set_offset_to_transform_parent(offset_to_transform_parent_);
   layer->SetDrawsContent(DrawsContent());
   // subtree_property_changed_ is propagated to all descendants while building
   // property trees. So, it is enough to check it only for the current layer.
   if (subtree_property_changed_ || layer_property_changed_)
     layer->NoteLayerPropertyChanged();
-  if (!FilterIsAnimating())
-    layer->SetFilters(inputs_.filters);
   layer->SetMasksToBounds(inputs_.masks_to_bounds);
   layer->set_main_thread_scrolling_reasons(
       inputs_.main_thread_scrolling_reasons);
   layer->SetNonFastScrollableRegion(inputs_.non_fast_scrollable_region);
   layer->SetTouchEventHandlerRegion(inputs_.touch_event_handler_region);
   layer->SetContentsOpaque(inputs_.contents_opaque);
   layer->SetBlendMode(inputs_.blend_mode);
   layer->SetPosition(inputs_.position);
   layer->set_should_flatten_transform_from_property_tree(
       should_flatten_transform_from_property_tree_);
@@ skipping 567 matching lines @@
   PropertyTrees* property_trees = layer_tree_host_->property_trees();
   if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
     return;
   DCHECK_EQ(effect_tree_index(), property_trees->effect_id_to_index_map[id()]);
   EffectNode* node = property_trees->effect_tree.Node(effect_tree_index());
   node->has_potential_opacity_animation =
       has_potential_animation || OpacityCanAnimateOnImplThread();
   property_trees->effect_tree.set_needs_update(true);
 }
 
+void Layer::OnFilterIsCurrentlyAnimatingChanged(bool is_currently_animating) {
+  DCHECK(layer_tree_host_);
+  PropertyTrees* property_trees = layer_tree_host_->property_trees();
+  if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
+    return;
+  DCHECK_EQ(effect_tree_index(), property_trees->effect_id_to_index_map[id()]);
+  EffectNode* node = property_trees->effect_tree.Node(effect_tree_index());
+  node->is_currently_animating_filter = is_currently_animating;
+}
+
+void Layer::OnFilterIsPotentiallyAnimatingChanged(
+    bool has_potential_animation) {
+  DCHECK(layer_tree_host_);
+  PropertyTrees* property_trees = layer_tree_host_->property_trees();
+  if (!property_trees->IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id()))
+    return;
+  DCHECK_EQ(effect_tree_index(), property_trees->effect_id_to_index_map[id()]);
+  EffectNode* node = property_trees->effect_tree.Node(effect_tree_index());
+  node->has_potential_filter_animation = has_potential_animation;
+}
+
 bool Layer::HasActiveAnimationForTesting() const {
   return layer_tree_host_
              ? GetAnimationHost()->HasActiveAnimationForTesting(element_id())
              : false;
 }
 
 void Layer::SetHasWillChangeTransformHint(bool has_will_change) {
   if (inputs_.has_will_change_transform_hint == has_will_change)
     return;
   inputs_.has_will_change_transform_hint = has_will_change;
@@ skipping 97 matching lines @@
       ->num_copy_requests_in_subtree;
 }
 
 gfx::Transform Layer::screen_space_transform() const {
   DCHECK_NE(transform_tree_index_, -1);
   return draw_property_utils::ScreenSpaceTransform(
       this, layer_tree_host_->property_trees()->transform_tree);
 }
 
 }  // namespace cc