CC Animations: Make LayerAnimationController creation optional

cc/blink/web_layer_impl.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/blink/web_layer_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 using blink::WebRect;
 using blink::WebSize;
 using blink::WebColor;
 using blink::WebFilterOperations;
 
 namespace cc_blink {
 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);
 }
 
 WebLayerImpl::WebLayerImpl(scoped_refptr<Layer> layer) : layer_(layer) {
   web_layer_client_ = nullptr;
   layer_->SetLayerClient(this);
 }
 
 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;
 }
 
 // static
 bool WebLayerImpl::UsingPictureLayer() {
   return g_impl_side_painting_enabled;
 }
 
 // static
 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();
 }
 
 void WebLayerImpl::invalidateRect(const blink::WebRect& rect) {
   layer_->SetNeedsDisplayRect(rect);
 }
 
 void WebLayerImpl::invalidate() {
   layer_->SetNeedsDisplay();
@@ skipping 440 matching lines @@
   if (parent)
     clip_parent = static_cast<WebLayerImpl*>(parent)->layer();
   layer_->SetClipParent(clip_parent);
 }
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 }  // namespace cc_blink