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

Unified Diff: cc/layers/effect_tree_layer_list_iterator_unittest.cc

Issue 2866733002: Remove owning_id from EffectNode and replace it by an opaque stable_id (Closed)
Patch Set: none Created 3 years, 7 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/input/scrollbar_animation_controller_unittest.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/effect_tree_layer_list_iterator_unittest.cc
diff --git a/cc/layers/effect_tree_layer_list_iterator_unittest.cc b/cc/layers/effect_tree_layer_list_iterator_unittest.cc
index 8f8c8e6c4a52d79d6cb6104821a53a491572b7b7..71fc0fc207a688e690241ab83c167625a9f7c4be 100644
--- a/cc/layers/effect_tree_layer_list_iterator_unittest.cc
+++ b/cc/layers/effect_tree_layer_list_iterator_unittest.cc
@@ -145,10 +145,10 @@ TEST_F(EffectTreeLayerListIteratorTest, SimpleTree) {
IterateFrontToBack();
EXPECT_COUNT(root_ptr, 5, -1, 4);
- EXPECT_COUNT(first_ptr, -1, -1, 3);
- EXPECT_COUNT(second_ptr, -1, -1, 2);
- EXPECT_COUNT(third_ptr, -1, -1, 1);
- EXPECT_COUNT(fourth_ptr, -1, -1, 0);
+ EXPECT_COUNT(first_ptr, 5, -1, 3);
+ EXPECT_COUNT(second_ptr, 5, -1, 2);
+ EXPECT_COUNT(third_ptr, 5, -1, 1);
+ EXPECT_COUNT(fourth_ptr, 5, -1, 0);
}
TEST_F(EffectTreeLayerListIteratorTest, ComplexTree) {
@@ -190,14 +190,14 @@ TEST_F(EffectTreeLayerListIteratorTest, ComplexTree) {
IterateFrontToBack();
EXPECT_COUNT(root_ptr, 9, -1, 8);
- EXPECT_COUNT(root1_ptr, -1, -1, 7);
- EXPECT_COUNT(root2_ptr, -1, -1, 6);
- EXPECT_COUNT(root21_ptr, -1, -1, 5);
- EXPECT_COUNT(root22_ptr, -1, -1, 4);
- EXPECT_COUNT(root221_ptr, -1, -1, 3);
- EXPECT_COUNT(root23_ptr, -1, -1, 2);
- EXPECT_COUNT(root231_ptr, -1, -1, 1);
- EXPECT_COUNT(root3_ptr, -1, -1, 0);
+ EXPECT_COUNT(root1_ptr, 9, -1, 7);
+ EXPECT_COUNT(root2_ptr, 9, -1, 6);
+ EXPECT_COUNT(root21_ptr, 9, -1, 5);
+ EXPECT_COUNT(root22_ptr, 9, -1, 4);
+ EXPECT_COUNT(root221_ptr, 9, -1, 3);
+ EXPECT_COUNT(root23_ptr, 9, -1, 2);
+ EXPECT_COUNT(root231_ptr, 9, -1, 1);
+ EXPECT_COUNT(root3_ptr, 9, -1, 0);
}
TEST_F(EffectTreeLayerListIteratorTest, ComplexTreeMultiSurface) {
@@ -243,14 +243,14 @@ TEST_F(EffectTreeLayerListIteratorTest, ComplexTreeMultiSurface) {
IterateFrontToBack();
EXPECT_COUNT(root_ptr, 14, -1, 13);
- EXPECT_COUNT(root1_ptr, -1, -1, 12);
+ EXPECT_COUNT(root1_ptr, 14, -1, 12);
EXPECT_COUNT(root2_ptr, 10, 11, -1);
- EXPECT_COUNT(root21_ptr, -1, -1, 9);
+ EXPECT_COUNT(root21_ptr, 10, 11, 9);
EXPECT_COUNT(root22_ptr, 7, 8, 6);
- EXPECT_COUNT(root221_ptr, -1, -1, 5);
+ EXPECT_COUNT(root221_ptr, 7, 8, 5);
EXPECT_COUNT(root23_ptr, 3, 4, 2);
- EXPECT_COUNT(root231_ptr, -1, -1, 1);
- EXPECT_COUNT(root3_ptr, -1, -1, 0);
+ EXPECT_COUNT(root231_ptr, 3, 4, 1);
+ EXPECT_COUNT(root3_ptr, 14, -1, 0);
}
} // namespace
« no previous file with comments | « cc/input/scrollbar_animation_controller_unittest.cc ('k') | cc/layers/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698