| Index: cc/layers/layer_impl_unittest.cc
|
| diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
|
| index ece1ab8577d35580cf291a61ad4b1bad327777bb..7f82bb5eb582b489f79c6cdbb629979839978fc5 100644
|
| --- a/cc/layers/layer_impl_unittest.cc
|
| +++ b/cc/layers/layer_impl_unittest.cc
|
| @@ -28,7 +28,7 @@ namespace {
|
|
|
| #define EXECUTE_AND_VERIFY_SUBTREE_CHANGED(code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| code_to_test; \
|
| EXPECT_TRUE( \
|
| root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(root)); \
|
| @@ -42,7 +42,7 @@ namespace {
|
|
|
| #define EXECUTE_AND_VERIFY_SUBTREE_DID_NOT_CHANGE(code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| code_to_test; \
|
| EXPECT_FALSE( \
|
| root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(root)); \
|
| @@ -57,7 +57,7 @@ namespace {
|
| #define EXECUTE_AND_VERIFY_NEEDS_PUSH_PROPERTIES_AND_SUBTREE_DID_NOT_CHANGE( \
|
| code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| code_to_test; \
|
| EXPECT_TRUE( \
|
| root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(root)); \
|
| @@ -71,7 +71,7 @@ namespace {
|
|
|
| #define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| root->layer_tree_impl()->property_trees()->full_tree_damaged = false; \
|
| code_to_test; \
|
| EXPECT_TRUE( \
|
| @@ -86,7 +86,7 @@ namespace {
|
|
|
| #define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| host_impl.active_tree()->property_trees()->needs_rebuild = true; \
|
| host_impl.active_tree()->BuildPropertyTreesForTesting(); \
|
| host_impl.ForcePrepareToDraw(); \
|
| @@ -96,7 +96,7 @@ namespace {
|
|
|
| #define VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(code_to_test) \
|
| root->layer_tree_impl()->ResetAllChangeTracking( \
|
| - PropertyTrees::ResetFlags::ALL_TREES); \
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES); \
|
| host_impl.active_tree()->property_trees()->needs_rebuild = true; \
|
| host_impl.active_tree()->BuildPropertyTreesForTesting(); \
|
| host_impl.ForcePrepareToDraw(); \
|
| @@ -138,7 +138,7 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) {
|
|
|
| root->test_properties()->force_render_surface = true;
|
| root->layer_tree_impl()->ResetAllChangeTracking(
|
| - PropertyTrees::ResetFlags::ALL_TREES);
|
| + PropertyTrees::Types::EFFECT_AND_TRANSFORM_TREES);
|
|
|
| root->AddChild(LayerImpl::Create(host_impl.active_tree(), 7));
|
| LayerImpl* child = root->children()[0];
|
|
|