CC Animations: Make LayerAnimationController creation optional

cc/layers/delegated_frame_provider_unittest.cc

 // Copyright 2013 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/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/returned_resource.h"
 #include "cc/resources/transferable_resource.h"
+#include "cc/trees/layer_tree_settings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class DelegatedFrameProviderTest
     : public testing::Test,
       public DelegatedFrameResourceCollectionClient {
  protected:
   DelegatedFrameProviderTest() : resources_available_(false) {}
@@ skipping 61 matching lines @@
 
   void SetFrameProvider(scoped_ptr<DelegatedFrameData> frame_data) {
     frame_provider_ =
         new DelegatedFrameProvider(resource_collection_, frame_data.Pass());
   }
 
   scoped_refptr<DelegatedFrameResourceCollection> resource_collection_;
   scoped_refptr<DelegatedFrameProvider> frame_provider_;
   bool resources_available_;
   ReturnedResourceArray resources_;
+  LayerSettings layer_settings_;
 };
 
 TEST_F(DelegatedFrameProviderTest, SameResources) {
   scoped_ptr<DelegatedFrameData> frame =
       CreateFrameData(gfx::Rect(1, 1), gfx::Rect(1, 1));
   AddTextureQuad(frame.get(), 444);
   AddTransferableResource(frame.get(), 444);
   SetFrameProvider(frame.Pass());
 
   frame = CreateFrameData(gfx::Rect(1, 1), gfx::Rect(1, 1));
@@ skipping 43 matching lines @@
   AddTextureQuad(frame.get(), 444);
   AddTransferableResource(frame.get(), 444);
 
   TransferableResourceArray reffed = frame->resource_list;
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
 
   gfx::RectF damage;
 
   // Both observers get a full frame of damage on the first request.
   frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
   EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
   EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
 
   // And both get no damage on the 2nd request. This adds a second ref to the
@@ skipping 35 matching lines @@
   AddTextureQuad(frame.get(), 444);
   AddTransferableResource(frame.get(), 444);
 
   TransferableResourceArray reffed = frame->resource_list;
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
 
   gfx::RectF damage;
 
   // Take a ref on each observer.
   frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
 
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
 
   // Release both refs. But there's still a ref held in the frame
@@ skipping 19 matching lines @@
   AddTextureQuad(frame.get(), 444);
   AddTransferableResource(frame.get(), 444);
 
   TransferableResourceArray reffed = frame->resource_list;
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
 
   gfx::RectF damage;
 
   // Take a ref on each observer.
   frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
 
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
 
   // Release both refs. But there's still a ref held in the frame
@@ skipping 21 matching lines @@
   AddTextureQuad(frame.get(), 444);
   AddTransferableResource(frame.get(), 444);
 
   TransferableResourceArray reffed = frame->resource_list;
   ReturnedResourceArray returned;
   TransferableResource::ReturnResources(reffed, &returned);
 
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(frame_provider_);
+      DelegatedRendererLayer::Create(layer_settings_, frame_provider_);
 
   gfx::RectF damage;
 
   // Both observers get a full frame of damage on the first request.
   frame_provider_->GetFrameDataAndRefResources(observer1.get(), &damage);
   EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
   frame_provider_->GetFrameDataAndRefResources(observer2.get(), &damage);
   EXPECT_EQ(gfx::RectF(5.f, 5.f).ToString(), damage.ToString());
 
   // And both get no damage on the 2nd request.
@@ skipping 76 matching lines @@
 
   frame_provider_ = nullptr;
 
   // Nothing is returned twice.
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(0u, resources_.size());
 }
 
 }  // namespace
 }  // namespace cc