cc : Add LayerToPropertyTreeIndices map to PropertyTrees

cc/layers/layer_impl_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/layers/layer_impl.h"
 
 #include "cc/animation/mutable_properties.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/output/filter_operation.h"
@@ skipping 10 matching lines @@
 #include "cc/trees/tree_synchronizer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 
 namespace cc {
 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));   \
   EXPECT_FALSE(                                                             \
       root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(child));  \
   EXPECT_FALSE(root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting( \
       grand_child));                                                        \
   EXPECT_TRUE(root->LayerPropertyChanged());                                \
   EXPECT_TRUE(child->LayerPropertyChanged());                               \
   EXPECT_TRUE(grand_child->LayerPropertyChanged());
 
 #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));   \
   EXPECT_FALSE(                                                             \
       root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(child));  \
   EXPECT_FALSE(root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting( \
       grand_child));                                                        \
   EXPECT_FALSE(root->LayerPropertyChanged());                               \
   EXPECT_FALSE(child->LayerPropertyChanged());                              \
   EXPECT_FALSE(grand_child->LayerPropertyChanged());
 
 #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));    \
   EXPECT_FALSE(                                                              \
       root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(child));   \
   EXPECT_FALSE(root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(  \
       grand_child));                                                         \
   EXPECT_FALSE(root->LayerPropertyChanged());                                \
   EXPECT_FALSE(child->LayerPropertyChanged());                               \
   EXPECT_FALSE(grand_child->LayerPropertyChanged());
 
 #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(                                                              \
       root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(root));   \
   EXPECT_FALSE(                                                             \
       root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting(child));  \
   EXPECT_FALSE(root->layer_tree_impl()->LayerNeedsPushPropertiesForTesting( \
       grand_child));                                                        \
   EXPECT_TRUE(root->LayerPropertyChanged());                                \
   EXPECT_FALSE(child->LayerPropertyChanged());                              \
   EXPECT_FALSE(grand_child->LayerPropertyChanged());
 
 #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();                                        \
   EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties()); \
   code_to_test;                                                          \
   EXPECT_TRUE(host_impl.active_tree()->needs_update_draw_properties());
 
 #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();                                        \
   EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties()); \
   code_to_test;                                                          \
   EXPECT_FALSE(host_impl.active_tree()->needs_update_draw_properties());
 
 static gfx::Vector2dF ScrollDelta(LayerImpl* layer_impl) {
   gfx::ScrollOffset delta =
       layer_impl->layer_tree_impl()
@@ skipping 21 matching lines @@
       LayerImpl::Create(host_impl.active_tree(), 1);
   LayerImpl* root_clip = root_clip_ptr.get();
   std::unique_ptr<LayerImpl> root_ptr =
       LayerImpl::Create(host_impl.active_tree(), 2);
   LayerImpl* root = root_ptr.get();
   root_clip_ptr->AddChild(std::move(root_ptr));
   host_impl.active_tree()->SetRootLayer(std::move(root_clip_ptr));
 
   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];
   child->AddChild(LayerImpl::Create(host_impl.active_tree(), 8));
   LayerImpl* grand_child = child->children()[0];
   root->SetScrollClipLayer(root_clip->id());
   host_impl.active_tree()->BuildPropertyTreesForTesting();
 
   // Adding children is an internal operation and should not mark layers as
   // changed.
@@ skipping 426 matching lines @@
 
   pending_layer->PushPropertiesTo(layer());
 
   EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(),
                    pending_layer->CurrentScrollOffset());
 }
 
 }  // namespace
 }  // namespace cc