Add support for converting cc::FilterOperations into an SkImageFilter

cc/trees/damage_tracker_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/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
@@ skipping 45 matching lines @@
   // surfaces to ancestors.
   for (int i = render_surface_layer_list.size() - 1; i >= 0; --i) {
     RenderSurfaceImpl* target_surface =
             render_surface_layer_list[i]->render_surface();
     target_surface->damage_tracker()->UpdateDamageTrackingState(
         target_surface->layer_list(),
         target_surface->OwningLayerId(),
         target_surface->SurfacePropertyChangedOnlyFromDescendant(),
         target_surface->content_rect(),
         render_surface_layer_list[i]->mask_layer(),
-        render_surface_layer_list[i]->filters(),
-        render_surface_layer_list[i]->filter().get());
+        render_surface_layer_list[i]->filters());
   }
 
   root->ResetAllChangeTrackingForSubtree();
 }
 
 class DamageTrackerTest : public testing::Test {
  public:
   DamageTrackerTest() : host_impl_(&proxy_) {}
 
   scoped_ptr<LayerImpl> CreateTestTreeWithOneSurface() {
@@ skipping 361 matching lines @@
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child = root->children()[0];
   gfx::RectF root_damage_rect, child_damage_rect;
 
   // Allow us to set damage on child too.
   child->SetDrawsContent(true);
 
   skia::RefPtr<SkImageFilter> filter =
           skia::AdoptRef(new SkBlurImageFilter(SkIntToScalar(2),
                                                SkIntToScalar(2)));
+  FilterOperations filters;
+  filters.Append(FilterOperation::CreateReferenceFilter(filter));
 
   // Setting the filter will damage the whole surface.
   ClearDamageForAllSurfaces(root.get());
-  child->SetFilter(filter);
+  child->SetFilters(filters);
   EmulateDrawingOneFrame(root.get());
   root_damage_rect =
           root->render_surface()->damage_tracker()->current_damage_rect();
   child_damage_rect =
           child->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(100.f, 100.f, 30.f, 30.f), root_damage_rect);
   EXPECT_FLOAT_RECT_EQ(gfx::RectF(0.f, 0.f, 30.f, 30.f), child_damage_rect);
 
   // CASE 1: Setting the update rect should damage the whole surface (for now)
   ClearDamageForAllSurfaces(root.get());
@@ skipping 827 matching lines @@
   ASSERT_TRUE(root == root->render_target());
   RenderSurfaceImpl* target_surface = root->render_surface();
 
   LayerImplList empty_list;
   target_surface->damage_tracker()->UpdateDamageTrackingState(
       empty_list,
       target_surface->OwningLayerId(),
       false,
       gfx::Rect(),
       NULL,
-      FilterOperations(),
-      NULL);
+      FilterOperations());
 
   gfx::RectF damage_rect =
           target_surface->damage_tracker()->current_damage_rect();
   EXPECT_TRUE(damage_rect.IsEmpty());
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageAccumulatesUntilReset) {
   // If damage is not cleared, it should accumulate.
 
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
@@ skipping 26 matching lines @@
   // Damage should remain empty even after one frame, since there's yet no new
   // damage.
   EmulateDrawingOneFrame(root.get());
   root_damage_rect =
           root->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 }
 
 }  // namespace
 }  // namespace cc