cc: Don't always rebuild property trees in LayerImplTests

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 64 matching lines @@
   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();                     \
-  host_impl.active_tree()->property_trees()->needs_rebuild = true;       \
-  host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();   \
   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();                     \
-  host_impl.active_tree()->property_trees()->needs_rebuild = true;       \
-  host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();   \
   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()
           ->property_trees()
           ->scroll_tree.GetScrollOffsetDeltaForTesting(layer_impl->id());
@@ skipping 173 matching lines @@
   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));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetBounds(large_size));
+  host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->ScrollBy(arbitrary_vector2d));
   VERIFY_NO_NEEDS_UPDATE_DRAW_PROPERTIES(layer->ScrollBy(gfx::Vector2d()));
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(
       layer->layer_tree_impl()->DidUpdateScrollOffset(
           layer->id(), layer->transform_tree_index()));
   layer->layer_tree_impl()
       ->property_trees()
       ->scroll_tree.SetScrollOffsetDeltaForTesting(layer->id(),
                                                    gfx::Vector2dF());
   VERIFY_NEEDS_UPDATE_DRAW_PROPERTIES(layer->SetCurrentScrollOffset(
@@ skipping 262 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