cc: Move filters to the effect tree

cc/trees/draw_property_utils.cc

Index: cc/trees/draw_property_utils.cc
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc
index 553a0d98db2a07f2088a49ef414c3fd52aaef13c..4a79c9df6606a8dd2db3967cc2d2baee3b80a060 100644
--- a/cc/trees/draw_property_utils.cc
+++ b/cc/trees/draw_property_utils.cc
@@ -42,7 +42,6 @@ static void ValidateRenderSurfaceForLayer(LayerImpl* layer) {
   if (layer->has_render_surface())
     return;
 
-  DCHECK(layer->filters().IsEmpty()) << "layer: " << layer->id();
   DCHECK(!IsRootLayer(layer)) << "layer: " << layer->id();
   EffectNode* effect_node =
       layer->layer_tree_impl()->property_trees()->effect_tree.Node(
@@ -51,6 +50,7 @@ static void ValidateRenderSurfaceForLayer(LayerImpl* layer) {
     return;
   DCHECK_EQ(effect_node->mask_layer_id, -1) << "layer: " << layer->id();
   DCHECK_EQ(effect_node->replica_layer_id, -1) << "layer: " << layer->id();
+  DCHECK(effect_node->filters.IsEmpty());
   DCHECK(effect_node->background_filters.IsEmpty());
 }