| Index: cc/trees/damage_tracker_unittest.cc
|
| diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
|
| index 8a8620744104106b1c9140afe99ef2424d9904e0..7fb8720b83d278f4a32021c0ad944a6cef6d1ca9 100644
|
| --- a/cc/trees/damage_tracker_unittest.cc
|
| +++ b/cc/trees/damage_tracker_unittest.cc
|
| @@ -63,8 +63,7 @@ void EmulateDrawingOneFrame(LayerImpl* root) {
|
| 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();
|
| @@ -446,10 +445,12 @@ TEST_F(DamageTrackerTest, VerifyDamageForImageFilter) {
|
| 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();
|
| @@ -1297,8 +1298,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) {
|
| false,
|
| gfx::Rect(),
|
| NULL,
|
| - FilterOperations(),
|
| - NULL);
|
| + FilterOperations());
|
|
|
| gfx::RectF damage_rect =
|
| target_surface->damage_tracker()->current_damage_rect();
|
|
|