CC Animations: Make LayerAnimationController creation optional

cc/blink/web_layer_impl.cc

Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index 8bad92a002e6b9bd13d3aca21f2b800da2ddeded..03aa727ec3cd88ddc911da0d783d675c2a135930 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -48,9 +48,11 @@ namespace {
 
 bool g_impl_side_painting_enabled = false;
 
+cc::LayerSettings g_layer_settings;

[piman, 2015/05/11 21:31:24]

Non-POD globals are forbidden by style guide. You can use a LazyInstance for
example, or have it in the RenderThreadImpl and pass it by pointer to
WebLayerImpl (being careful with tests).

+
 }  // namespace
 
-WebLayerImpl::WebLayerImpl() : layer_(Layer::Create()) {
+WebLayerImpl::WebLayerImpl() : layer_(Layer::Create(LayerSettings())) {
   web_layer_client_ = nullptr;
   layer_->SetLayerClient(this);
 }
@@ -62,7 +64,8 @@ WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {
 
 WebLayerImpl::~WebLayerImpl() {
   layer_->ClearRenderSurface();
-  layer_->set_layer_animation_delegate(nullptr);
+  if (animation_delegate_adapter_.get())
+    layer_->set_layer_animation_delegate(nullptr);
   web_layer_client_ = nullptr;
 }
 
@@ -76,6 +79,16 @@ void WebLayerImpl::SetImplSidePaintingEnabled(bool enabled) {
   g_impl_side_painting_enabled = enabled;
 }
 
+// static
+void WebLayerImpl::SetLayerSettings(const cc::LayerSettings& settings) {
+  g_layer_settings = settings;
+}
+
+// static
+cc::LayerSettings& WebLayerImpl::LayerSettings() {
+  return g_layer_settings;
+}
+
 int WebLayerImpl::id() const {
   return layer_->id();
 }