CC Animations: Make LayerAnimationController creation optional

cc/layers/content_layer.cc

 // Copyright 2010 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/content_layer.h"
 
 #include "base/auto_reset.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 12 matching lines @@
     ContentLayerClient* client) {
   return make_scoped_ptr(new ContentLayerPainter(client));
 }
 
 void ContentLayerPainter::Paint(SkCanvas* canvas,
                                 const gfx::Rect& content_rect) {
   client_->PaintContents(canvas, content_rect,
                          ContentLayerClient::PAINTING_BEHAVIOR_NORMAL);
 }
 
-scoped_refptr<ContentLayer> ContentLayer::Create(ContentLayerClient* client) {
-  return make_scoped_refptr(new ContentLayer(client));
+scoped_refptr<ContentLayer> ContentLayer::Create(const LayerSettings& settings,
+                                                 ContentLayerClient* client) {
+  return make_scoped_refptr(new ContentLayer(settings, client));
 }
 
-ContentLayer::ContentLayer(ContentLayerClient* client)
-    : TiledLayer(), client_(client) {
+ContentLayer::ContentLayer(const LayerSettings& settings,
+                           ContentLayerClient* client)
+    : TiledLayer(settings), client_(client) {
 }
 
 ContentLayer::~ContentLayer() {}
 
 void ContentLayer::ClearClient() {
   client_ = nullptr;
   UpdateDrawsContent(HasDrawableContent());
 }
 
 bool ContentLayer::HasDrawableContent() const {
@@ skipping 81 matching lines @@
   return picture;
 }
 
 void ContentLayer::OnOutputSurfaceCreated() {
   SetTextureFormat(
       layer_tree_host()->GetRendererCapabilities().best_texture_format);
   TiledLayer::OnOutputSurfaceCreated();
 }
 
 }  // namespace cc