Move implementation of WebFilterOperations into cc

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"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/WebKit/public/platform/WebFilterOperation.h"
-#include "third_party/WebKit/public/platform/WebFilterOperations.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/quad_f.h"
 
-using WebKit::WebFilterOperation;
-using WebKit::WebFilterOperations;
-
 namespace cc {
 namespace {
 
 void ExecuteCalculateDrawProperties(
     LayerImpl* root,
     LayerImplList& render_surface_layer_list) {
   int dummy_max_texture_size = 512;
 
   // Sanity check: The test itself should create the root layer's render
   //               surface, so that the surface (and its damage tracker) can
@@ skipping 380 matching lines @@
   gfx::RectF damage_we_care_about =
           gfx::RectF(gfx::PointF(), gfx::SizeF(500.f, 500.f));
   EXPECT_TRUE(root_damage_rect.Contains(damage_we_care_about));
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageForBlurredSurface) {
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithTwoSurfaces();
   LayerImpl* surface = root->children()[0];
   LayerImpl* child = surface->children()[0];
 
-  WebFilterOperations filters;
-  filters.append(WebFilterOperation::createBlurFilter(5));
+  FilterOperations filters;
+  filters.Append(FilterOperation::CreateBlurFilter(5));
   int outset_top, outset_right, outset_bottom, outset_left;
-  filters.getOutsets(outset_top, outset_right, outset_bottom, outset_left);
+  filters.GetOutsets(&outset_top, &outset_right, &outset_bottom, &outset_left);
 
   // Setting the filter will damage the whole surface.
   ClearDamageForAllSurfaces(root.get());
   surface->SetFilters(filters);
   EmulateDrawingOneFrame(root.get());
 
   // Setting the update rect should cause the corresponding damage to the
   // surface, blurred based on the size of the blur filter.
   ClearDamageForAllSurfaces(root.get());
   child->set_update_rect(gfx::RectF(1.f, 2.f, 3.f, 4.f));
@@ skipping 50 matching lines @@
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageForBackgroundBlurredChild) {
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithTwoSurfaces();
   LayerImpl* child1 = root->children()[0];
   LayerImpl* child2 = root->children()[1];
 
   // Allow us to set damage on child1 too.
   child1->SetDrawsContent(true);
 
-  WebFilterOperations filters;
-  filters.append(WebFilterOperation::createBlurFilter(2));
+  FilterOperations filters;
+  filters.Append(FilterOperation::CreateBlurFilter(2));
   int outset_top, outset_right, outset_bottom, outset_left;
-  filters.getOutsets(outset_top, outset_right, outset_bottom, outset_left);
+  filters.GetOutsets(&outset_top, &outset_right, &outset_bottom, &outset_left);
 
   // Setting the filter will damage the whole surface.
   ClearDamageForAllSurfaces(root.get());
   child1->SetBackgroundFilters(filters);
   EmulateDrawingOneFrame(root.get());
 
   // CASE 1: Setting the update rect should cause the corresponding damage to
   //         the surface, blurred based on the size of the child's background
   //         blur filter.
   ClearDamageForAllSurfaces(root.get());
@@ skipping 794 matching lines @@
 
   ASSERT_TRUE(root == root->render_target());
   RenderSurfaceImpl* target_surface = root->render_surface();
   target_surface->ClearLayerLists();
   target_surface->damage_tracker()->UpdateDamageTrackingState(
       target_surface->layer_list(),
       target_surface->OwningLayerId(),
       false,
       gfx::Rect(),
       NULL,
-      WebFilterOperations(),
+      FilterOperations(),
       NULL);
 
   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.
 
@@ skipping 27 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