Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(677)

Unified Diff: cc/trees/damage_tracker_unittest.cc

Issue 21154002: Add support for converting cc::FilterOperations into an SkImageFilter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix cc_messages Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/trees/damage_tracker_unittest.cc
diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc
index 9e4537974d9116e293037974453cf7989e429e12..c3671cf1806772368e72e6b47331a4758ff90436 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();
@@ -448,10 +447,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();
@@ -1299,8 +1300,7 @@ TEST_F(DamageTrackerTest, VerifyDamageForEmptyLayerList) {
false,
gfx::Rect(),
NULL,
- FilterOperations(),
- NULL);
+ FilterOperations());
gfx::RectF damage_rect =
target_surface->damage_tracker()->current_damage_rect();

Powered by Google App Engine
This is Rietveld 408576698