CC Animations: Make LayerAnimationController creation optional

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 <set>
 #include <vector>
 
@@ skipping 33 matching lines @@
   MockLayerImpl(LayerTreeImpl* tree_impl, int layer_id)
       : LayerImpl(tree_impl, layer_id),
         layer_impl_destruction_list_(NULL) {}
 
   std::vector<int>* layer_impl_destruction_list_;
 };
 
 class MockLayer : public Layer {
  public:
   static scoped_refptr<MockLayer> Create(
+      const LayerSettings& settings,
       std::vector<int>* layer_impl_destruction_list) {
-    return make_scoped_refptr(new MockLayer(layer_impl_destruction_list));
+    return make_scoped_refptr(
+        new MockLayer(settings, layer_impl_destruction_list));
   }
 
   scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override {
     return MockLayerImpl::Create(tree_impl, layer_id_);
   }
 
   void PushPropertiesTo(LayerImpl* layer_impl) override {
     Layer::PushPropertiesTo(layer_impl);
 
     MockLayerImpl* mock_layer_impl = static_cast<MockLayerImpl*>(layer_impl);
     mock_layer_impl->SetLayerImplDestructionList(layer_impl_destruction_list_);
   }
 
  private:
-  explicit MockLayer(std::vector<int>* layer_impl_destruction_list)
-      : Layer(), layer_impl_destruction_list_(layer_impl_destruction_list) {}
+  explicit MockLayer(const LayerSettings& settings,
+                     std::vector<int>* layer_impl_destruction_list)
+      : Layer(settings),
+        layer_impl_destruction_list_(layer_impl_destruction_list) {}
   ~MockLayer() override {}
 
   std::vector<int>* layer_impl_destruction_list_;
 };
 
 class FakeLayerAnimationController : public LayerAnimationController {
  public:
   static scoped_refptr<LayerAnimationController> Create() {
     return static_cast<LayerAnimationController*>(
         new FakeLayerAnimationController);
@@ skipping 107 matching lines @@
 
 class TreeSynchronizerTest : public testing::Test {
  public:
   TreeSynchronizerTest()
       : client_(FakeLayerTreeHostClient::DIRECT_3D),
         host_(FakeLayerTreeHost::Create(&client_)) {}
 
  protected:
   FakeLayerTreeHostClient client_;
   scoped_ptr<FakeLayerTreeHost> host_;
+  LayerSettings layer_settings_;
 };
 
 // Attempts to synchronizes a null tree. This should not crash, and should
 // return a null tree.
 TEST_F(TreeSynchronizerTest, SyncNullTree) {
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           static_cast<Layer*>(NULL), nullptr, host_->active_tree());
 
   EXPECT_TRUE(!layer_impl_tree_root.get());
 }
 
 // Constructs a very simple tree and synchronizes it without trying to reuse any
 // preexisting layers.
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeFromEmpty) {
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
 
   host_->SetRootLayer(layer_tree_root);
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
 
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 }
 
 // Constructs a very simple tree and synchronizes it attempting to reuse some
 // layers
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeReusingLayers) {
   std::vector<int> layer_impl_destruction_list;
 
   scoped_refptr<Layer> layer_tree_root =
-      MockLayer::Create(&layer_impl_destruction_list);
-  layer_tree_root->AddChild(MockLayer::Create(&layer_impl_destruction_list));
-  layer_tree_root->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list);
+  layer_tree_root->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
+  layer_tree_root->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
 
   host_->SetRootLayer(layer_tree_root);
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   // We have to push properties to pick up the destruction list pointer.
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   // Add a new layer to the Layer side
-  layer_tree_root->children()[0]->
-      AddChild(MockLayer::Create(&layer_impl_destruction_list));
+  layer_tree_root->children()[0]->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
   // Remove one.
   layer_tree_root->children()[1]->RemoveFromParent();
   int second_layer_impl_id = layer_impl_tree_root->children()[1]->id();
 
   // Synchronize again. After the sync the trees should be equivalent and we
   // should have created and destroyed one LayerImpl.
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   ASSERT_EQ(1u, layer_impl_destruction_list.size());
   EXPECT_EQ(second_layer_impl_id, layer_impl_destruction_list[0]);
 }
 
 // Constructs a very simple tree and checks that a stacking-order change is
 // tracked properly.
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeAndTrackStackingOrderChange) {
   std::vector<int> layer_impl_destruction_list;
 
   // Set up the tree and sync once. child2 needs to be synced here, too, even
   // though we remove it to set up the intended scenario.
   scoped_refptr<Layer> layer_tree_root =
-      MockLayer::Create(&layer_impl_destruction_list);
-  scoped_refptr<Layer> child2 = MockLayer::Create(&layer_impl_destruction_list);
-  layer_tree_root->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list);
+  scoped_refptr<Layer> child2 =
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list);
+  layer_tree_root->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
   layer_tree_root->AddChild(child2);
 
   host_->SetRootLayer(layer_tree_root);
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
@@ skipping 18 matching lines @@
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   // Check that the impl thread properly tracked the change.
   EXPECT_FALSE(layer_impl_tree_root->LayerPropertyChanged());
   EXPECT_FALSE(layer_impl_tree_root->children()[0]->LayerPropertyChanged());
   EXPECT_TRUE(layer_impl_tree_root->children()[1]->LayerPropertyChanged());
 }
 
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeAndProperties) {
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
 
   host_->SetRootLayer(layer_tree_root);
 
   // 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);
@@ skipping 30 matching lines @@
 }
 
 TEST_F(TreeSynchronizerTest, ReuseLayerImplsAfterStructuralChange) {
   std::vector<int> layer_impl_destruction_list;
 
   // Set up a tree with this sort of structure:
   // root --- A --- B ---+--- C
   //                     |
   //                     +--- D
   scoped_refptr<Layer> layer_tree_root =
-      MockLayer::Create(&layer_impl_destruction_list);
-  layer_tree_root->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list);
+  layer_tree_root->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
 
   scoped_refptr<Layer> layer_a = layer_tree_root->children()[0].get();
-  layer_a->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+  layer_a->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
 
   scoped_refptr<Layer> layer_b = layer_a->children()[0].get();
-  layer_b->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+  layer_b->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
 
   scoped_refptr<Layer> layer_c = layer_b->children()[0].get();
-  layer_b->AddChild(MockLayer::Create(&layer_impl_destruction_list));
+  layer_b->AddChild(
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
   scoped_refptr<Layer> layer_d = layer_b->children()[1].get();
 
   host_->SetRootLayer(layer_tree_root);
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
@@ skipping 28 matching lines @@
 
   EXPECT_EQ(0u, layer_impl_destruction_list.size());
 }
 
 // Constructs a very simple tree, synchronizes it, then synchronizes to a
 // totally new tree. All layers from the old tree should be deleted.
 TEST_F(TreeSynchronizerTest, SyncSimpleTreeThenDestroy) {
   std::vector<int> layer_impl_destruction_list;
 
   scoped_refptr<Layer> old_layer_tree_root =
-      MockLayer::Create(&layer_impl_destruction_list);
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list);
   old_layer_tree_root->AddChild(
-      MockLayer::Create(&layer_impl_destruction_list));
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
   old_layer_tree_root->AddChild(
-      MockLayer::Create(&layer_impl_destruction_list));
+      MockLayer::Create(layer_settings_, &layer_impl_destruction_list));
 
   host_->SetRootLayer(old_layer_tree_root);
 
   int old_tree_root_layer_id = old_layer_tree_root->id();
   int old_tree_first_child_layer_id = old_layer_tree_root->children()[0]->id();
   int old_tree_second_child_layer_id = old_layer_tree_root->children()[1]->id();
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           old_layer_tree_root.get(), nullptr, host_->active_tree());
   ExpectTreesAreIdentical(old_layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   // We have to push properties to pick up the destruction list pointer.
   TreeSynchronizer::PushProperties(old_layer_tree_root.get(),
                                    layer_impl_tree_root.get());
 
   // Remove all children on the Layer side.
   old_layer_tree_root->RemoveAllChildren();
 
   // Synchronize again. After the sync all LayerImpls from the old tree should
   // be deleted.
-  scoped_refptr<Layer> new_layer_tree_root = Layer::Create();
+  scoped_refptr<Layer> new_layer_tree_root = Layer::Create(layer_settings_);
   host_->SetRootLayer(new_layer_tree_root);
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(new_layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_->active_tree());
   ExpectTreesAreIdentical(new_layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_->active_tree());
 
   ASSERT_EQ(3u, layer_impl_destruction_list.size());
 
   EXPECT_TRUE(std::find(layer_impl_destruction_list.begin(),
                         layer_impl_destruction_list.end(),
                         old_tree_root_layer_id) !=
               layer_impl_destruction_list.end());
   EXPECT_TRUE(std::find(layer_impl_destruction_list.begin(),
                         layer_impl_destruction_list.end(),
                         old_tree_first_child_layer_id) !=
               layer_impl_destruction_list.end());
   EXPECT_TRUE(std::find(layer_impl_destruction_list.begin(),
                         layer_impl_destruction_list.end(),
                         old_tree_second_child_layer_id) !=
               layer_impl_destruction_list.end());
 }
 
 // Constructs+syncs a tree with mask, replica, and replica mask layers.
 TEST_F(TreeSynchronizerTest, SyncMaskReplicaAndReplicaMaskLayers) {
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
 
   // First child gets a mask layer.
-  scoped_refptr<Layer> mask_layer = Layer::Create();
+  scoped_refptr<Layer> mask_layer = Layer::Create(layer_settings_);
   layer_tree_root->children()[0]->SetMaskLayer(mask_layer.get());
 
   // Second child gets a replica layer.
-  scoped_refptr<Layer> replica_layer = Layer::Create();
+  scoped_refptr<Layer> replica_layer = Layer::Create(layer_settings_);
   layer_tree_root->children()[1]->SetReplicaLayer(replica_layer.get());
 
   // Third child gets a replica layer with a mask layer.
-  scoped_refptr<Layer> replica_layer_with_mask = Layer::Create();
-  scoped_refptr<Layer> replica_mask_layer = Layer::Create();
+  scoped_refptr<Layer> replica_layer_with_mask = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> replica_mask_layer = Layer::Create(layer_settings_);
   replica_layer_with_mask->SetMaskLayer(replica_mask_layer.get());
   layer_tree_root->children()[2]->
       SetReplicaLayer(replica_layer_with_mask.get());
 
   host_->SetRootLayer(layer_tree_root);
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_->active_tree());
 
@@ skipping 36 matching lines @@
   LayerTreeSettings settings;
   FakeProxy proxy;
   DebugScopedSetImplThread impl(&proxy);
   FakeRenderingStatsInstrumentation stats_instrumentation;
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
                                 shared_bitmap_manager.get(), NULL, NULL, 0);
 
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
   host_->SetRootLayer(layer_tree_root);
 
   layer_tree_root->SetLayerAnimationControllerForTest(
       FakeLayerAnimationController::Create());
 
   EXPECT_FALSE(static_cast<FakeLayerAnimationController*>(
       layer_tree_root->layer_animation_controller())->SynchronizedAnimations());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
@@ skipping 13 matching lines @@
   LayerTreeSettings settings;
   FakeProxy proxy;
   DebugScopedSetImplThread impl(&proxy);
   FakeRenderingStatsInstrumentation stats_instrumentation;
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
                                 shared_bitmap_manager.get(), NULL, NULL, 0);
 
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  scoped_refptr<Layer> scroll_parent = Layer::Create();
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> scroll_parent = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(scroll_parent);
-  layer_tree_root->AddChild(Layer::Create());
-  layer_tree_root->AddChild(Layer::Create());
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
+  layer_tree_root->AddChild(Layer::Create(layer_settings_));
 
   host_->SetRootLayer(layer_tree_root);
 
   // First child is the second and third child's scroll parent.
   layer_tree_root->children()[1]->SetScrollParent(scroll_parent.get());
   layer_tree_root->children()[2]->SetScrollParent(scroll_parent.get());
 
   scoped_ptr<LayerImpl> layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(
           layer_tree_root.get(), nullptr, host_impl->active_tree());
@@ skipping 15 matching lines @@
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case two");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 
   // Add an additional scroll layer.
-  scoped_refptr<Layer> additional_scroll_child = Layer::Create();
+  scoped_refptr<Layer> additional_scroll_child = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(additional_scroll_child);
   additional_scroll_child->SetScrollParent(scroll_parent.get());
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   {
     SCOPED_TRACE("case three");
     ExpectTreesAreIdentical(layer_tree_root.get(),
                             layer_impl_tree_root.get(),
                             host_impl->active_tree());
   }
 }
 
 TEST_F(TreeSynchronizerTest, SynchronizeClipParent) {
   LayerTreeSettings settings;
   FakeProxy proxy;
   DebugScopedSetImplThread impl(&proxy);
   FakeRenderingStatsInstrumentation stats_instrumentation;
   scoped_ptr<SharedBitmapManager> shared_bitmap_manager(
       new TestSharedBitmapManager());
   scoped_ptr<LayerTreeHostImpl> host_impl =
       LayerTreeHostImpl::Create(settings, NULL, &proxy, &stats_instrumentation,
                                 shared_bitmap_manager.get(), NULL, NULL, 0);
 
-  scoped_refptr<Layer> layer_tree_root = Layer::Create();
-  scoped_refptr<Layer> clip_parent = Layer::Create();
-  scoped_refptr<Layer> intervening = Layer::Create();
-  scoped_refptr<Layer> clip_child1 = Layer::Create();
-  scoped_refptr<Layer> clip_child2 = Layer::Create();
+  scoped_refptr<Layer> layer_tree_root = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> clip_parent = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> intervening = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> clip_child1 = Layer::Create(layer_settings_);
+  scoped_refptr<Layer> clip_child2 = Layer::Create(layer_settings_);
   layer_tree_root->AddChild(clip_parent);
   clip_parent->AddChild(intervening);
   intervening->AddChild(clip_child1);
   intervening->AddChild(clip_child2);
 
   host_->SetRootLayer(layer_tree_root);
 
   // First child is the second and third child's scroll parent.
   clip_child1->SetClipParent(clip_parent.get());
   clip_child2->SetClipParent(clip_parent.get());
@@ skipping 15 matching lines @@
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
                           host_impl->active_tree());
 
   // Add an additional clip child.
-  scoped_refptr<Layer> additional_clip_child = Layer::Create();
+  scoped_refptr<Layer> additional_clip_child = Layer::Create(layer_settings_);
   intervening->AddChild(additional_clip_child);
   additional_clip_child->SetClipParent(clip_parent.get());
   layer_impl_tree_root =
       TreeSynchronizer::SynchronizeTrees(layer_tree_root.get(),
                                          layer_impl_tree_root.Pass(),
                                          host_impl->active_tree());
   TreeSynchronizer::PushProperties(layer_tree_root.get(),
                                    layer_impl_tree_root.get());
   ExpectTreesAreIdentical(layer_tree_root.get(),
                           layer_impl_tree_root.get(),
@@ skipping 13 matching lines @@
                           host_impl->active_tree());
 
   // The clip children should have been unhooked.
   EXPECT_EQ(2u, intervening->children().size());
   EXPECT_FALSE(clip_child2->clip_parent());
   EXPECT_FALSE(additional_clip_child->clip_parent());
 }
 
 }  // namespace
 }  // namespace cc