CC Animations: Make LayerAnimationController creation optional

cc/layers/surface_layer.cc

 // Copyright 2014 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/surface_layer.h"
 
 #include "cc/layers/surface_layer_impl.h"
 #include "cc/output/swap_promise.h"
 #include "cc/trees/layer_tree_host.h"
 
@@ skipping 17 matching lines @@
   }
   int64 TraceId() const override { return 0; }
 
   SurfaceSequence sequence_;
   SurfaceLayer::SatisfyCallback satisfy_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(SatisfySwapPromise);
 };
 
 scoped_refptr<SurfaceLayer> SurfaceLayer::Create(
+    const LayerSettings& settings,
     const SatisfyCallback& satisfy_callback,
     const RequireCallback& require_callback) {
   return make_scoped_refptr(
-      new SurfaceLayer(satisfy_callback, require_callback));
+      new SurfaceLayer(settings, satisfy_callback, require_callback));
 }
 
-SurfaceLayer::SurfaceLayer(const SatisfyCallback& satisfy_callback,
+SurfaceLayer::SurfaceLayer(const LayerSettings& settings,
+                           const SatisfyCallback& satisfy_callback,
                            const RequireCallback& require_callback)
-    : Layer(),
+    : Layer(settings),
       surface_scale_(1.f),
       satisfy_callback_(satisfy_callback),
       require_callback_(require_callback) {
 }
 
 SurfaceLayer::~SurfaceLayer() {
   DCHECK(!layer_tree_host());
   DCHECK(destroy_sequence_.is_null());
 }
 
@@ skipping 57 matching lines @@
   if (!layer_tree_host())
     return;
   DCHECK(!destroy_sequence_.is_null());
   scoped_ptr<SatisfySwapPromise> satisfy(
       new SatisfySwapPromise(destroy_sequence_, satisfy_callback_));
   layer_tree_host()->QueueSwapPromise(satisfy.Pass());
   destroy_sequence_ = SurfaceSequence();
 }
 
 }  // namespace cc