cc : Add OnFilterAnimated to effect tree

cc/layers/layer_impl_unittest.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/layers/layer_impl.h"
 
 #include "cc/animation/mutable_properties.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/output/filter_operation.h"
@@ skipping 162 matching lines @@
 
   // These properties are internal, and should not be considered "change" when
   // they are used.
   EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE(
       root->SetUpdateRect(arbitrary_rect));
   EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetBounds(arbitrary_size));
   host_impl.active_tree()->property_trees()->needs_rebuild = true;
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
 
   // Changing these properties affects the entire subtree of layers.
-  EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->OnFilterAnimated(arbitrary_filters));
-  EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
-      root->OnFilterAnimated(FilterOperations()));
+  EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          arbitrary_filters, root->effect_tree_index(),
+          host_impl.active_tree()));
+  EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          FilterOperations(), root->effect_tree_index(),
+          host_impl.active_tree()));
   EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
       host_impl.active_tree()->property_trees()->effect_tree.OnOpacityAnimated(
           arbitrary_number, root->effect_tree_index(),
           host_impl.active_tree()));
   EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
       root->OnTransformAnimated(arbitrary_transform));
   EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->ScrollBy(arbitrary_vector2d);
                                      root->SetNeedsPushProperties());
   // SetBoundsDelta changes subtree only when masks_to_bounds is true and it
   // doesn't set needs_push_properties as it is always called on active tree.
@@ skipping 81 matching lines @@
   // Render surface functions should not trigger update draw properties, because
   // creating render surface is part of update draw properties.
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetHasRenderSurface(true));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetHasRenderSurface(false));
   // Create a render surface, because we must have a render surface if we have
   // filters.
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetHasRenderSurface(true));
 
   // Related filter functions.
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
-      root->OnFilterAnimated(arbitrary_filters));
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          arbitrary_filters, root->effect_tree_index(),
+          host_impl.active_tree()));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
-      root->OnFilterAnimated(arbitrary_filters));
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          arbitrary_filters, root->effect_tree_index(),
+          host_impl.active_tree()));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
-      root->OnFilterAnimated(FilterOperations()));
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          FilterOperations(), root->effect_tree_index(),
+          host_impl.active_tree()));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
-      root->OnFilterAnimated(arbitrary_filters));
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          arbitrary_filters, root->effect_tree_index(),
+          host_impl.active_tree()));
 
   // Related scrolling functions.
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(large_size));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(large_size));
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->ScrollBy(arbitrary_vector2d));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->ScrollBy(gfx::Vector2d()));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
       layer->layer_tree_impl()->DidUpdateScrollOffset(
           layer->id(), layer->transform_tree_index()));
@@ skipping 24 matching lines @@
           host_impl.active_tree()));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
       layer->OnTransformAnimated(arbitrary_transform));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(arbitrary_size);
                                       layer->NoteLayerPropertyChanged());
 
   // Unrelated functions, set to the same values, no needs update.
   layer->test_properties()->filters = arbitrary_filters;
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
-      layer->OnFilterAnimated(arbitrary_filters));
+      host_impl.active_tree()->property_trees()->effect_tree.OnFilterAnimated(
+          arbitrary_filters, layer->effect_tree_index(),
+          host_impl.active_tree()));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetMasksToBounds(true));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetContentsOpaque(true));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
       layer2->SetPosition(arbitrary_point_f));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->Set3dSortingContextId(1));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetDrawsContent(true));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(
       layer->SetBackgroundColor(arbitrary_color));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(arbitrary_size));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetElementId(ElementId(2, 0)));
@@ skipping 222 matching lines @@
 
   pending_layer->PushPropertiesTo(layer());
 
   EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(),
                    pending_layer->CurrentScrollOffset());
 }
 
 }  // namespace
 }  // namespace cc