CC Animations: Make LayerAnimationController creation optional

chrome/browser/android/compositor/layer/content_layer.cc

Index: chrome/browser/android/compositor/layer/content_layer.cc
diff --git a/chrome/browser/android/compositor/layer/content_layer.cc b/chrome/browser/android/compositor/layer/content_layer.cc
index 016c7f1db349eb6d8008054409ecc104e8c1f34a..ce4c54e477eb88dfa492c9c96511ac1a90371734 100644
--- a/chrome/browser/android/compositor/layer/content_layer.cc
+++ b/chrome/browser/android/compositor/layer/content_layer.cc
@@ -13,6 +13,8 @@
 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) {
@@ -161,7 +163,7 @@ scoped_refptr<cc::Layer> ContentLayer::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) {
@@ -170,6 +172,16 @@ ContentLayer::ContentLayer(TabContentManager* 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.