Move implementation of WebFilterOperations into cc

cc/trees/occlusion_tracker_unittest.cc

 // Copyright 2012 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/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/debug/overdraw_metrics.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
+#include "cc/output/filter_operation.h"
+#include "cc/output/filter_operations.h"
 #include "cc/test/animation_test_common.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/test/occlusion_tracker_test_common.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.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 "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
 
 class TestContentLayer : public Layer {
  public:
   TestContentLayer() : Layer(), override_opaque_contents_rect_(false) {}
 
   virtual bool DrawsContent() const OVERRIDE { return true; }
@@ skipping 1581 matching lines @@
                                  gfx::PointF(30.f, 30.f),
                                  gfx::Size(500, 500),
                                  true);
     typename Types::ContentLayerType* opacity_layer =
         this->CreateDrawingLayer(parent,
                                  layer_transform,
                                  gfx::PointF(30.f, 30.f),
                                  gfx::Size(500, 500),
                                  true);
 
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(10.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(10.f));
     blur_layer->SetFilters(filters);
 
-    filters.clear();
-    filters.append(WebKit::WebFilterOperation::createGrayscaleFilter(0.5f));
+    filters.Clear();
+    filters.Append(FilterOperation::CreateGrayscaleFilter(0.5f));
     opaque_layer->SetFilters(filters);
 
-    filters.clear();
-    filters.append(WebKit::WebFilterOperation::createOpacityFilter(0.5f));
+    filters.Clear();
+    filters.Append(FilterOperation::CreateOpacityFilter(0.5f));
     opacity_layer->SetFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // Opacity layer won't contribute to occlusion.
     this->VisitLayer(opacity_layer, &occlusion);
@@ skipping 1920 matching lines @@
                                  gfx::Size(100, 50),
                                  true);
     typename Types::LayerType* occluding_layer5 =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(250.f, 50.f),
                                  gfx::Size(50, 50),
                                  true);
 
     // Filters make the layer own a surface.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(10.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(10.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     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);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // These layers occlude pixels directly beside the filtered_surface. Because
     // filtered surface blends pixels in a radius, it will need to see some of
     // the pixels (up to radius far) underneath the occluding layers.
@@ skipping 156 matching lines @@
     typename Types::LayerType* filtered_surface2 = this->CreateDrawingLayer(
         parent, scale_by_half, gfx::PointF(), gfx::Size(300, 300), false);
     typename Types::LayerType* occluding_layer_above =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(100.f, 100.f),
                                  gfx::Size(50, 50),
                                  true);
 
     // Filters make the layers own surfaces.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(1.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(1.f));
     filtered_surface1->SetBackgroundFilters(filters);
     filtered_surface2->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     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);
 
     this->CalcDrawEtc(root);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(occluding_layer_above, &occlusion);
     EXPECT_EQ(gfx::Rect().ToString(),
               occlusion.occlusion_from_outside_target().ToString());
@@ skipping 79 matching lines @@
                                  true);
     typename Types::LayerType* occluding_layer5 =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(250.f, 50.f),
                                  gfx::Size(50, 50),
                                  true);
 
     // Filters make the layer own a surface. This filter is large enough that it
     // goes outside the bottom of the clipping_surface.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(12.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(12.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     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);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // These layers occlude pixels directly beside the filtered_surface. Because
     // filtered surface blends pixels in a radius, it will need to see some of
     // the pixels (up to radius far) underneath the occluding layers.
@@ skipping 183 matching lines @@
                                  scale_by_half,
                                  gfx::PointF(50.f, 50.f),
                                  gfx::Size(100, 100),
                                  false);
     this->CreateReplicaLayer(filtered_surface,
                              this->identity_matrix,
                              gfx::PointF(300.f, 0.f),
                              gfx::Size());
 
     // Filters make the layer own a surface.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(3.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     // The surface has a background blur, so it blurs non-opaque pixels below
     // it.
@@ skipping 57 matching lines @@
                                  gfx::Size(50, 50),
                                  true);
     typename Types::LayerType* above_replica_layer =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(200.f, 50.f),
                                  gfx::Size(50, 50),
                                  true);
 
     // Filters make the layer own a surface.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(3.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(above_replica_layer, &occlusion);
     this->VisitLayer(above_surface_layer, &occlusion);
@@ skipping 82 matching lines @@
                                  gfx::Size(10, 10),
                                  true);
     typename Types::LayerType* beside_replica_layer =
         this->CreateDrawingLayer(parent,
                                  this->identity_matrix,
                                  gfx::PointF(200.f, 40.f),
                                  gfx::Size(10, 10),
                                  true);
 
     // Filters make the layer own a surface.
-    WebKit::WebFilterOperations filters;
-    filters.append(WebKit::WebFilterOperation::createBlurFilter(3.f));
+    FilterOperations filters;
+    filters.Append(FilterOperation::CreateBlurFilter(3.f));
     filtered_surface->SetBackgroundFilters(filters);
 
     // Save the distance of influence for the blur effect.
     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);
 
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType,
                                  typename Types::RenderSurfaceType> occlusion(
         gfx::Rect(0, 0, 1000, 1000));
 
     this->VisitLayer(beside_replica_layer, &occlusion);
     this->VisitLayer(beside_surface_layer, &occlusion);
     this->VisitLayer(above_replica_layer, &occlusion);
@@ skipping 537 matching lines @@
               occlusion.occlusion_from_outside_target().ToString());
     EXPECT_EQ(gfx::Rect(10, 10, 50, 50).ToString(),
               occlusion.occlusion_from_inside_target().ToString());
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestScaledLayerInSurfaceIsClipped)
 
 }  // namespace
 }  // namespace cc