cc: Move filters to the effect tree

cc/layers/render_surface_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/layers/render_surface_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 58 matching lines @@
   is_clipped = false;
 }
 
 RenderSurfaceImpl::DrawProperties::~DrawProperties() {}
 
 gfx::RectF RenderSurfaceImpl::DrawableContentRect() const {
   if (content_rect().IsEmpty())
     return gfx::RectF();
 
   gfx::Rect surface_content_rect = content_rect();
-  if (!owning_layer_->filters().IsEmpty()) {
+  const FilterOperations& filters = Filters();
+  if (!filters.IsEmpty()) {
     const gfx::Transform& owning_layer_draw_transform =
         owning_layer_->DrawTransform();
     DCHECK(owning_layer_draw_transform.IsScale2d());
-    surface_content_rect = owning_layer_->filters().MapRect(
+    surface_content_rect = filters.MapRect(
         surface_content_rect, owning_layer_draw_transform.matrix());
   }
   gfx::RectF drawable_content_rect = MathUtil::MapClippedRect(
       draw_transform(), gfx::RectF(surface_content_rect));
   if (HasReplica()) {
     drawable_content_rect.Union(MathUtil::MapClippedRect(
         replica_draw_transform(), gfx::RectF(surface_content_rect)));
-  } else if (!owning_layer_->filters().IsEmpty() && is_clipped()) {
+  } else if (!filters.IsEmpty() && is_clipped()) {
     // Filter could move pixels around, but still need to be clipped.
     drawable_content_rect.Intersect(gfx::RectF(clip_rect()));
   }
 
   // If the rect has a NaN coordinate, we return empty rect to avoid crashes in
   // functions (for example, gfx::ToEnclosedRect) that are called on this rect.
   if (std::isnan(drawable_content_rect.x()) ||
       std::isnan(drawable_content_rect.y()) ||
       std::isnan(drawable_content_rect.right()) ||
       std::isnan(drawable_content_rect.bottom()))
@@ skipping 48 matching lines @@
 
 LayerImpl* RenderSurfaceImpl::ReplicaMaskLayer() {
   int replica_mask_layer_id = OwningEffectNode()->replica_mask_layer_id;
   return owning_layer_->layer_tree_impl()->LayerById(replica_mask_layer_id);
 }
 
 bool RenderSurfaceImpl::HasReplicaMask() const {
   return OwningEffectNode()->replica_mask_layer_id != -1;
 }
 
+const FilterOperations& RenderSurfaceImpl::Filters() const {
+  return OwningEffectNode()->filters;
+}
+
 const FilterOperations& RenderSurfaceImpl::BackgroundFilters() const {
   return OwningEffectNode()->background_filters;
 }
 
 bool RenderSurfaceImpl::HasCopyRequest() const {
   return OwningEffectNode()->has_copy_request;
 }
 
 int RenderSurfaceImpl::TransformTreeIndex() const {
   return owning_layer_->transform_tree_index();
@@ skipping 219 matching lines @@
   }
 
   DCHECK(owning_layer_draw_transform.IsScale2d());
   gfx::Vector2dF owning_layer_to_target_scale =
       owning_layer_draw_transform.Scale2d();
 
   RenderPassDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect,
                render_pass_id, mask_resource_id, mask_uv_scale,
-               mask_texture_size, owning_layer_->filters(),
-               owning_layer_to_target_scale, BackgroundFilters());
+               mask_texture_size, Filters(), owning_layer_to_target_scale,
+               BackgroundFilters());
 }
 
 }  // namespace cc