Merge 194269

cc/trees/tree_synchronizer_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/tree_synchronizer.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 253 matching lines @@
   // Pick some random properties to set. The values are not important, we're
   // just testing that at least some properties are making it through.
   gfx::PointF root_position = gfx::PointF(2.3f, 7.4f);
   layer_tree_root->SetPosition(root_position);
 
   float first_child_opacity = 0.25f;
   layer_tree_root->children()[0]->SetOpacity(first_child_opacity);
 
   gfx::Size second_child_bounds = gfx::Size(25, 53);
   layer_tree_root->children()[1]->SetBounds(second_child_bounds);
+  layer_tree_root->children()[1]->SavePaintProperties();
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          scoped_ptr<LayerImpl>(),
                                          host_impl_.active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl_.active_tree());
 
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
@@ skipping 225 matching lines @@
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl_.active_tree());
 
   EXPECT_TRUE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 }
 
 }  // namespace
 }  // namespace cc