Index: cc/layers/layer_impl_unittest.cc |
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc |
index ff553afb7245dd56adaf0cdbff6c4b1f6dd451d3..db381265b62cde02ed57c69a2c2a06f0fc3e939b 100644 |
--- a/cc/layers/layer_impl_unittest.cc |
+++ b/cc/layers/layer_impl_unittest.cc |
@@ -63,14 +63,15 @@ namespace { |
EXPECT_FALSE(child->LayerPropertyChanged()); \ |
EXPECT_FALSE(grand_child->LayerPropertyChanged()); |
-#define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(code_to_test) \ |
- root->ResetAllChangeTrackingForSubtree(); \ |
- code_to_test; \ |
- EXPECT_TRUE(root->needs_push_properties()); \ |
- EXPECT_FALSE(child->needs_push_properties()); \ |
- EXPECT_FALSE(grand_child->needs_push_properties()); \ |
- EXPECT_TRUE(root->LayerPropertyChanged()); \ |
- EXPECT_FALSE(child->LayerPropertyChanged()); \ |
+#define EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(code_to_test) \ |
+ root->ResetAllChangeTrackingForSubtree(); \ |
+ root->layer_tree_impl()->property_trees()->full_tree_damaged = false; \ |
+ code_to_test; \ |
+ EXPECT_TRUE(root->needs_push_properties()); \ |
+ EXPECT_FALSE(child->needs_push_properties()); \ |
+ EXPECT_FALSE(grand_child->needs_push_properties()); \ |
+ EXPECT_TRUE(root->LayerPropertyChanged()); \ |
+ EXPECT_FALSE(child->LayerPropertyChanged()); \ |
EXPECT_FALSE(grand_child->LayerPropertyChanged()); |
#define VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(code_to_test) \ |
@@ -168,8 +169,9 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) { |
host_impl.active_tree()->BuildPropertyTreesForTesting(); |
// Changing these properties affects the entire subtree of layers. |
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(arbitrary_filters)); |
- EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetFilters(FilterOperations())); |
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->OnFilterAnimated(arbitrary_filters)); |
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED( |
+ root->OnFilterAnimated(FilterOperations())); |
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->ScrollBy(arbitrary_vector2d)); |
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetScrollDelta(gfx::Vector2d())); |
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->PushScrollOffsetFromMainThread( |
@@ -177,6 +179,11 @@ TEST(LayerImplTest, VerifyLayerChangesAreTrackedProperly) { |
EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->OnOpacityAnimated(arbitrary_number)); |
EXECUTE_AND_VERIFY_SUBTREE_CHANGED( |
root->OnTransformAnimated(arbitrary_transform)); |
+ // SetBounsDelta changes subtree only when masksToBounds is true and it |
ajuma
2016/03/02 14:34:09
typos: SetBoundsDelta, masks_to_bounds
jaydasika
2016/03/02 16:27:08
Done.
|
+ // doesn't set needsPushProperties as it is always called on active tree. |
ajuma
2016/03/02 14:34:09
needs_push_properties
jaydasika
2016/03/02 16:27:08
Done.
|
+ root->SetMasksToBounds(true); |
+ EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBoundsDelta(arbitrary_vector2d); |
+ root->SetNeedsPushProperties()); |
// Changing these properties only affects the layer itself. |
EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetDrawsContent(true)); |
@@ -311,10 +318,14 @@ TEST(LayerImplTest, VerifyNeedsUpdateDrawProperties) { |
VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetForceRenderSurface(false)); |
// Related filter functions. |
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetFilters(arbitrary_filters)); |
- VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetFilters(arbitrary_filters)); |
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetFilters(FilterOperations())); |
- VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetFilters(arbitrary_filters)); |
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
+ root->OnFilterAnimated(arbitrary_filters)); |
+ VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES( |
+ root->OnFilterAnimated(arbitrary_filters)); |
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
+ root->OnFilterAnimated(FilterOperations())); |
+ VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES( |
+ root->OnFilterAnimated(arbitrary_filters)); |
// Related scrolling functions. |
VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(large_size)); |