CC Animations: Make LayerAnimationController creation optional

cc/layers/contents_scaling_layer.cc

 // Copyright 2012 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/contents_scaling_layer.h"
 #include "cc/trees/layer_tree_host.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 namespace cc {
 
 gfx::Size ContentsScalingLayer::ComputeContentBoundsForScale(
     float scale_x,
     float scale_y) const {
   return gfx::ToCeiledSize(gfx::ScaleSize(bounds(), scale_x, scale_y));
 }
 
-ContentsScalingLayer::ContentsScalingLayer()
-    : last_update_contents_scale_x_(0.f),
-      last_update_contents_scale_y_(0.f) {}
+ContentsScalingLayer::ContentsScalingLayer(const LayerSettings& settings)
+    : Layer(settings),
+      last_update_contents_scale_x_(0.f),
+      last_update_contents_scale_y_(0.f) {
+}
 
 ContentsScalingLayer::~ContentsScalingLayer() {
 }
 
 void ContentsScalingLayer::CalculateContentsScale(
     float ideal_contents_scale,
     float* contents_scale_x,
     float* contents_scale_y,
     gfx::Size* content_bounds) {
   float old_contents_scale_x = *contents_scale_x;
@@ skipping 24 matching lines @@
     return updated;
 
   last_update_contents_scale_x_ = draw_properties().contents_scale_x;
   last_update_contents_scale_y_ = draw_properties().contents_scale_y;
   // Invalidate the whole layer if scale changed.
   SetNeedsDisplayRect(gfx::Rect(paint_properties().bounds));
   return updated;
 }
 
 }  // namespace cc