cc : Check copy request count using effect tree

cc/trees/layer_tree_impl.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_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 747 matching lines @@
 }
 
 void LayerTreeImpl::ClearViewportLayers() {
   overscroll_elasticity_layer_id_ = Layer::INVALID_ID;
   page_scale_layer_id_ = Layer::INVALID_ID;
   inner_viewport_scroll_layer_id_ = Layer::INVALID_ID;
   outer_viewport_scroll_layer_id_ = Layer::INVALID_ID;
 }
 
 #if DCHECK_IS_ON()
-int SanityCheckCopyRequestCounts(LayerImpl* layer) {
-  int count = layer->HasCopyRequest() ? 1 : 0;
-  for (size_t i = 0; i < layer->children().size(); ++i) {
-    count += SanityCheckCopyRequestCounts(layer->child_at(i));
+void SanityCheckCopyRequestCounts(LayerImpl* root_layer) {

[ajuma, 2016/03/29 19:30:43]

This is only using the root_layer in order to get the LayerTreeImpl, so it
should probably just take the LayerTreeImpl as an argument instead.

[jaydasika, 2016/03/29 19:35:15]

Done.

+  EffectTree& effect_tree =
+      root_layer->layer_tree_impl()->property_trees()->effect_tree;
+  const int effect_tree_size = static_cast<int>(effect_tree.size());
+  std::vector<int> copy_requests_count_in_effect_tree(effect_tree_size);
+  for (auto* layer : *root_layer->layer_tree_impl()) {
+    if (layer->HasCopyRequest()) {
+      copy_requests_count_in_effect_tree[layer->effect_tree_index()]++;
+    }
   }
-  if (layer->layer_tree_impl()
-          ->property_trees()
-          ->effect_tree.Node(layer->effect_tree_index())
-          ->owner_id == layer->id()) {
-    DCHECK_EQ(count, layer->num_copy_requests_in_target_subtree())
-        << ", id: " << layer->id();
-  } else {
-    DCHECK_LE(count, layer->num_copy_requests_in_target_subtree())
-        << ", id: " << layer->id();
+  for (int i = effect_tree_size - 1; i >= 0; i--) {
+    EffectNode* node = effect_tree.Node(i);
+    DCHECK_EQ(node->data.num_copy_requests_in_subtree,
+              copy_requests_count_in_effect_tree[i]);
+    if (node->parent_id >= 0)
+      copy_requests_count_in_effect_tree[node->parent_id] +=
+          copy_requests_count_in_effect_tree[i];
   }
-  return count;
 }
 #endif
 
 bool LayerTreeImpl::UpdateDrawProperties(bool update_lcd_text) {
 #if DCHECK_IS_ON()
   if (root_layer())
     SanityCheckCopyRequestCounts(root_layer());
 #endif
 
   if (!needs_update_draw_properties_)
@@ skipping 1311 matching lines @@
 }
 
 void LayerTreeImpl::ResetAllChangeTracking(PropertyTrees::ResetFlags flag) {
   layers_that_should_push_properties_.clear();
   for (auto* layer : *this)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking(flag);
 }
 
 }  // namespace cc