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

Unified Diff: cc/trees/layer_tree_host_common_unittest.cc

Issue 2110683004: cc: Move filters to the effect tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 4 years, 5 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
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index a5bfd83427141f109f49c8820ce7fe7020bc6240..a1ca55a36fd7ee95e4f46315a6472f0b3c529eb1 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -1421,7 +1421,7 @@ TEST_F(LayerTreeHostCommonTest, RenderSurfaceListForFilter) {
false, true);
FilterOperations filters;
filters.Append(FilterOperation::CreateBlurFilter(10.0f));
- parent->SetFilters(filters);
+ parent->test_properties()->filters = filters;
LayerImplList render_surface_layer_list;
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
@@ -1455,7 +1455,7 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForReferenceFilter) {
FilterOperations filters;
filters.Append(FilterOperation::CreateReferenceFilter(
SkOffsetImageFilter::Make(50, 50, nullptr)));
- child->SetFilters(filters);
+ child->test_properties()->filters = filters;
ExecuteCalculateDrawProperties(root);
@@ -1484,7 +1484,7 @@ TEST_F(LayerTreeHostCommonTest, DrawableContentRectForReferenceFilterHighDpi) {
FilterOperations filters;
filters.Append(FilterOperation::CreateReferenceFilter(
SkOffsetImageFilter::Make(50, 50, nullptr)));
- child->SetFilters(filters);
+ child->test_properties()->filters = filters;
ExecuteCalculateDrawProperties(root, device_scale_factor);
@@ -8506,9 +8506,8 @@ TEST_F(LayerTreeHostCommonTest, AnimatedFilterCreatesRenderSurface) {
EXPECT_TRUE(child->has_render_surface());
EXPECT_FALSE(grandchild->has_render_surface());
- EXPECT_TRUE(root->filters().IsEmpty());
- EXPECT_TRUE(child->filters().IsEmpty());
- EXPECT_TRUE(grandchild->filters().IsEmpty());
+ EXPECT_TRUE(root->render_surface()->Filters().IsEmpty());
+ EXPECT_TRUE(child->render_surface()->Filters().IsEmpty());
EXPECT_FALSE(root->FilterIsAnimating());
EXPECT_TRUE(child->FilterIsAnimating());
@@ -8555,9 +8554,8 @@ TEST_F(LayerTreeHostCommonTest, DelayedFilterAnimationCreatesRenderSurface) {
EXPECT_TRUE(child->has_render_surface());
EXPECT_FALSE(grandchild->has_render_surface());
- EXPECT_TRUE(root->filters().IsEmpty());
- EXPECT_TRUE(child->filters().IsEmpty());
- EXPECT_TRUE(grandchild->filters().IsEmpty());
+ EXPECT_TRUE(root->render_surface()->Filters().IsEmpty());
+ EXPECT_TRUE(child->render_surface()->Filters().IsEmpty());
EXPECT_FALSE(root->FilterIsAnimating());
EXPECT_FALSE(root->HasPotentiallyRunningFilterAnimation());
« no previous file with comments | « cc/trees/layer_tree_host_common.cc ('k') | cc/trees/layer_tree_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698