CC Animations: Make LayerAnimationController creation optional

chrome/browser/android/compositor/layer/content_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 "chrome/browser/android/compositor/layer/content_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_lists.h"
 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace chrome {
 namespace android {
 
+cc::LayerSettings g_content_layer_settings;

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

Same here wrt static non-POD.

+
 // static
 scoped_refptr<ContentLayer> ContentLayer::Create(
     TabContentManager* tab_content_manager) {
   return make_scoped_refptr(new ContentLayer(tab_content_manager));
 }
 
 static void SetOpacityOnLeaf(scoped_refptr<cc::Layer> layer, float alpha) {
   const cc::LayerList& children = layer->children();
   if (children.size() > 0) {
     layer->SetOpacity(1.0f);
@@ skipping 128 matching lines @@
   if (content_attached_ && DoesLeafDrawContents(layer()->children()[0]))
     return layer_->children()[0]->bounds();
   return gfx::Size(0, 0);
 }
 
 scoped_refptr<cc::Layer> ContentLayer::layer() {
   return layer_;
 }
 
 ContentLayer::ContentLayer(TabContentManager* tab_content_manager)
-    : layer_(cc::Layer::Create()),
+    : layer_(cc::Layer::Create(ContentLayerSettings())),
       content_attached_(false),
       static_attached_(false),
       tab_content_manager_(tab_content_manager) {
 }
 
 ContentLayer::~ContentLayer() {
 }
 
+// static
+const cc::LayerSettings& ContentLayer::ContentLayerSettings() {
+  return g_content_layer_settings;
+}
+
+// static
+void ContentLayer::SetContentLayerSettings(const cc::LayerSettings& settings) {
+  g_content_layer_settings = settings;
+}
+
 void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) {
   // Check indices
   // content_attached_, expect at least 1 child.
   DCHECK(!content_attached_ || layer_->children().size() > 0);
 
   if (!layer.get()) {
     if (content_attached_)
       layer_->child_at(0)->RemoveFromParent();
     content_attached_ = false;
     return;
@@ skipping 63 matching lines @@
 
 void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer,
                                    gfx::Rect clipping) {
   if (!static_layer.get())
     return;
   static_layer->Clip(clipping);
 }
 
 }  //  namespace android
 }  //  namespace chrome