Keeping track of descendants that draw content instead of recalcualting

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 3086 matching lines @@
         ++expected_push_properties_grandchild_;
         ++expected_push_properties_child2_;
         break;
       case 5:
         layer_tree_host()->SetNeedsCommit();
         // No layers need commit.
         break;
       case 6:
         child_->RemoveFromParent();
         // No layers need commit.
+        ++expected_push_properties_root_;
         break;
       case 7:
         root_->AddChild(child_);
         // Layers added to the tree get committed.
         ++expected_push_properties_child_;
         ++expected_push_properties_grandchild_;
+        ++expected_push_properties_root_;
         break;
       case 8:
+        ++expected_push_properties_root_;
+        ++expected_push_properties_child_;
         grandchild_->RemoveFromParent();
         // No layers need commit.
         break;
       case 9:
         child_->AddChild(grandchild_);
         // Layers added to the tree get committed.
         ++expected_push_properties_grandchild_;
+        ++expected_push_properties_root_;
+        ++expected_push_properties_child_;
         break;
       case 10:
         layer_tree_host()->SetViewportSize(gfx::Size(20, 20));
         // No layers need commit.
         break;
       case 11:
         layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.8f, 1.1f);
         // No layers need commit.
         break;
       case 12:
         child_->SetPosition(gfx::Point(1, 1));
         // The modified layer needs commit
         ++expected_push_properties_child_;
         break;
       case 13:
         child2_->SetPosition(gfx::Point(1, 1));
         // The modified layer needs commit
         ++expected_push_properties_child2_;
         break;
       case 14:
         child_->RemoveFromParent();
         root_->AddChild(child_);
         // Layers added to the tree get committed.
         ++expected_push_properties_child_;
         ++expected_push_properties_grandchild_;
+        ++expected_push_properties_root_;
         break;
       case 15:
         grandchild_->SetPosition(gfx::Point(1, 1));
         // The modified layer needs commit
         ++expected_push_properties_grandchild_;
         break;
       case 16:
         // SetNeedsDisplay does not always set needs commit (so call it
         // explicitly), but is a property change.
         child_->SetNeedsDisplay();
@@ skipping 92 matching lines @@
         expected_push_properties_child_impl_ =
             expected_push_properties_child2_impl_;
         expected_push_properties_child2_impl_ = 0;
         // grandchild_impl becomes grandchild2_impl.
         expected_push_properties_grandchild_impl_ =
             expected_push_properties_grandchild2_impl_;
         expected_push_properties_grandchild2_impl_ = 0;
 
         // grandchild_impl is now the leaf that always pushes. It is pushed.
         ++expected_push_properties_grandchild_impl_;
+        ++expected_push_properties_root_impl_;
         break;
       case 7:
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
 
         // Child is added back. New layers are initialized.
         ++expected_push_properties_grandchild2_impl_;
         ++expected_push_properties_child2_impl_;
+        ++expected_push_properties_root_impl_;
         break;
       case 8:
         // Leaf is removed.
         expected_push_properties_grandchild2_impl_ = 0;
 
         // Always pushing.
         ++expected_push_properties_grandchild_impl_;
+        ++expected_push_properties_child2_impl_;
+        ++expected_push_properties_root_impl_;
         break;
       case 9:
         // Leaf is added back
         ++expected_push_properties_grandchild2_impl_;
 
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
+        ++expected_push_properties_root_impl_;
+        ++expected_push_properties_child2_impl_;
         break;
       case 10:
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
         break;
       case 11:
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
         break;
       case 12:
@@ skipping 14 matching lines @@
         // Second child is removed from tree. Don't discard counts because
         // they are added back before commit.
 
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
 
         // Second child added back.
         ++expected_push_properties_child2_impl_;
         ++expected_push_properties_grandchild2_impl_;
 
+        ++expected_push_properties_root_impl_;
         break;
       case 15:
         // The position of this child was changed.
         ++expected_push_properties_grandchild2_impl_;
 
         // The leaf that always pushes is pushed.
         ++expected_push_properties_grandchild_impl_;
         break;
       case 16:
         // Second child is invalidated with SetNeedsDisplay
@@ skipping 219 matching lines @@
         EXPECT_FALSE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         grandchild1_->RemoveFromParent();
         grandchild1_->SetPosition(gfx::Point(1, 1));
 
-        EXPECT_FALSE(root_->needs_push_properties());
-        EXPECT_FALSE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->descendant_needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         child_->AddChild(grandchild1_);
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         grandchild2_->SetPosition(gfx::Point(1, 1));
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         // grandchild2_ will still need a push properties.
         grandchild1_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         // grandchild3_ does not need a push properties, so recursing should
         // no longer be needed.
         grandchild2_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
-        EXPECT_FALSE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->descendant_needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestPushPropertiesRemovingChildStopsRecursion);
 
 class LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence
@@ skipping 15 matching lines @@
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         // grandchild2_ will still need a push properties.
         grandchild1_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        // We will need push properties because our drawable children changed
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         // grandchild3_ does not need a push properties, so recursing should
         // no longer be needed.
         grandchild2_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
-        EXPECT_FALSE(root_->descendant_needs_push_properties());
-        EXPECT_FALSE(child_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->descendant_needs_push_properties());
+        EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestPushPropertiesRemovingChildStopsRecursionWithPersistence);
 
@@ skipping 17 matching lines @@
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         // Change grandchildren while their parent is not in the tree.
         child_->RemoveFromParent();
         grandchild1_->SetPosition(gfx::Point(1, 1));
         grandchild2_->SetPosition(gfx::Point(1, 1));
         root_->AddChild(child_);
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         grandchild1_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         grandchild2_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         grandchild3_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
 
         EndTest();
         break;
     }
   }
 };
 
@@ skipping 31 matching lines @@
         EXPECT_TRUE(child_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         grandchild1_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         grandchild2_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
 
         child_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_FALSE(root_->descendant_needs_push_properties());
 
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestPushPropertiesSetPropertyInParentThenChild);
@@ skipping 29 matching lines @@
         EXPECT_TRUE(child_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild1_->needs_push_properties());
         EXPECT_FALSE(grandchild1_->descendant_needs_push_properties());
         EXPECT_TRUE(grandchild2_->needs_push_properties());
         EXPECT_FALSE(grandchild2_->descendant_needs_push_properties());
         EXPECT_FALSE(grandchild3_->needs_push_properties());
         EXPECT_FALSE(grandchild3_->descendant_needs_push_properties());
 
         grandchild1_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_TRUE(child_->descendant_needs_push_properties());
 
         grandchild2_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_TRUE(root_->descendant_needs_push_properties());
         EXPECT_TRUE(child_->needs_push_properties());
         EXPECT_FALSE(child_->descendant_needs_push_properties());
 
         child_->RemoveFromParent();
 
-        EXPECT_FALSE(root_->needs_push_properties());
+        EXPECT_TRUE(root_->needs_push_properties());
         EXPECT_FALSE(root_->descendant_needs_push_properties());
 
         EndTest();
         break;
     }
   }
 };
 
 MULTI_THREAD_TEST_F(
     LayerTreeHostTestPushPropertiesSetPropertyInChildThenParent);
@@ skipping 1042 matching lines @@
   const gfx::Size bounds_;
   FakeContentLayerClient client_;
   scoped_refptr<ContentLayerWithUpdateTracking> content_layer_;
   scoped_refptr<FakePictureLayer> picture_layer_;
   Layer* child_layer_;
 };
 
 MULTI_THREAD_TEST_F(LayerTreeHostTestContinuousPainting);
 
 }  // namespace cc