| Index: cc/layers/layer_unittest.cc
|
| diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
|
| index caec92e5ec26bf15efd99f81d3f77189ccaaef25..9c0afeb77cedc96bd55a15f7e10733f4e76d6399 100644
|
| --- a/cc/layers/layer_unittest.cc
|
| +++ b/cc/layers/layer_unittest.cc
|
| @@ -1122,7 +1122,7 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
|
| child2->PushPropertiesTo(child2_impl.get());
|
| grand_child->PushPropertiesTo(grand_child_impl.get());
|
| layer_tree_host_->property_trees()->ResetAllChangeTracking(
|
| - PropertyTrees::ResetFlags::ALL_TREES));
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES));
|
| EXPECT_FALSE(node->data.transform_changed);
|
|
|
| EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(1);
|
| @@ -1141,7 +1141,7 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
|
| child->PushPropertiesTo(child_impl.get());
|
| grand_child->PushPropertiesTo(grand_child_impl.get());
|
| layer_tree_host_->property_trees()->ResetAllChangeTracking(
|
| - PropertyTrees::ResetFlags::ALL_TREES));
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES));
|
| node = layer_tree_host_->property_trees()->transform_tree.Node(
|
| child->transform_tree_index());
|
| EXPECT_FALSE(node->data.transform_changed);
|
| @@ -1158,7 +1158,7 @@ TEST_F(LayerTest, LayerPropertyChangedForSubtree) {
|
| child2->PushPropertiesTo(child2_impl.get());
|
| grand_child->PushPropertiesTo(grand_child_impl.get());
|
| layer_tree_host_->property_trees()->ResetAllChangeTracking(
|
| - PropertyTrees::ResetFlags::ALL_TREES));
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES));
|
|
|
| gfx::Transform arbitrary_transform;
|
| arbitrary_transform.Scale3d(0.1f, 0.2f, 0.3f);
|
| @@ -1731,7 +1731,7 @@ TEST_F(LayerTest, PushPropertiesAccumulatesUpdateRect) {
|
| // If we do clear the LayerImpl side, then the next update_rect() should be
|
| // fresh without accumulation.
|
| host_impl_.active_tree()->ResetAllChangeTracking(
|
| - PropertyTrees::ResetFlags::ALL_TREES);
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES);
|
| test_layer->SetNeedsDisplayRect(gfx::Rect(10, 10, 5, 5));
|
| test_layer->PushPropertiesTo(impl_layer_ptr);
|
| EXPECT_FLOAT_RECT_EQ(gfx::RectF(10.f, 10.f, 5.f, 5.f),
|
|
|