diff options
Diffstat (limited to 'cc/trees/damage_tracker_unittest.cc')
| -rw-r--r-- | cc/trees/damage_tracker_unittest.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index 56bf80b..d65ff20 100644 --- a/cc/trees/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc @@ -6,20 +6,17 @@ #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 { @@ -420,10 +417,10 @@ TEST_F(DamageTrackerTest, VerifyDamageForBlurredSurface) { LayerImpl* surface = root->children()[0]; LayerImpl* child = surface->children()[0]; - WebFilterOperations filters; - filters.append(WebFilterOperation::createBlurFilter(5)); + FilterOperations filters; + filters.Append(FilterOperation::CreateBlurFilter(5.f)); 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()); @@ -494,10 +491,10 @@ TEST_F(DamageTrackerTest, VerifyDamageForBackgroundBlurredChild) { // 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.f)); 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()); @@ -1312,7 +1309,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) { false, gfx::Rect(), NULL, - WebFilterOperations(), + FilterOperations(), NULL); gfx::RectF damage_rect = |