CC Animations: Make LayerAnimationController creation optional

cc/layers/layer.h

 // 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.
 
 #ifndef CC_LAYERS_LAYER_H_
 #define CC_LAYERS_LAYER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 44 matching lines @@
 class AnimationDelegate;
 struct AnimationEvent;
 class CopyOutputRequest;
 class LayerAnimationDelegate;
 class LayerAnimationEventObserver;
 class LayerClient;
 class LayerImpl;
 class LayerTreeHost;
 class LayerTreeHostCommon;
 class LayerTreeImpl;
+class LayerTreeSettings;
 class PriorityCalculator;
 class RenderingStatsInstrumentation;
 class ResourceUpdateQueue;
 class ScrollbarLayerInterface;
 class SimpleEnclosedRegion;
 struct AnimationEvent;
 template <typename LayerType>
 class OcclusionTracker;
 
 // Base class for composited layers. Special layer types are derived from
@@ skipping 343 matching lines @@
   void RemoveAnimation(int animation_id);
   void RemoveAnimation(int animation_id, Animation::TargetProperty property);
 
   LayerAnimationController* layer_animation_controller() {
     return layer_animation_controller_.get();
   }
   void SetLayerAnimationControllerForTest(
       scoped_refptr<LayerAnimationController> controller);
 
   void set_layer_animation_delegate(AnimationDelegate* delegate) {
+    DCHECK(layer_animation_controller_);
     layer_animation_controller_->set_layer_animation_delegate(delegate);
   }
 
   bool HasActiveAnimation() const;
+  void RegisterForAnimations(AnimationRegistrar* registrar,
+                             const LayerTreeSettings& settings);
 
   void AddLayerAnimationEventObserver(
       LayerAnimationEventObserver* animation_observer);
   void RemoveLayerAnimationEventObserver(
       LayerAnimationEventObserver* animation_observer);
 
   virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const;
 
   virtual ScrollbarLayerInterface* ToScrollbarLayer();
 
@@ skipping 286 matching lines @@
 
   std::vector<FrameTimingRequest> frame_timing_requests_;
   bool frame_timing_requests_dirty_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_H_