CC Animations: Make LayerAnimationController creation optional

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <limits>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 212 matching lines @@
       !cmd->HasSwitch(switches::kDisableGpuVsync);
   settings.main_frame_before_activation_enabled =
       cmd->HasSwitch(cc::switches::kEnableMainFrameBeforeActivation) &&
       !cmd->HasSwitch(cc::switches::kDisableMainFrameBeforeActivation);
   settings.report_overscroll_only_for_scrollable_axes =
       !compositor_deps_->IsElasticOverscrollEnabled();
   settings.accelerated_animation_enabled =
       !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation);
   settings.use_display_lists = cmd->HasSwitch(switches::kEnableSlimmingPaint);
   if (cmd->HasSwitch(switches::kEnableCompositorAnimationTimelines)) {
-    settings.use_compositor_animation_timelines = true;
+    settings.hud_layer_settings_.use_compositor_animation_timelines = true;

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

Could you use WebLayerImpl::LayerSettings() here for
settings.hud_layer_settings_? It would keep them consistent between each other.

     blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true);
   }
   if (cmd->HasSwitch(switches::kEnableBeginFrameScheduling) &&
       !widget_->for_oopif()) {
     // TODO(simonhong): Apply BeginFrame scheduling for OOPIF.
     // See crbug.com/471411.
     settings.use_external_begin_frame_source = true;
   }
 
   settings.default_tile_size = CalculateDefaultTileSize(widget_);
@@ skipping 410 matching lines @@
 bool RenderWidgetCompositor::commitRequested() const {
   return layer_tree_host_->CommitRequested();
 }
 
 void RenderWidgetCompositor::didStopFlinging() {
   layer_tree_host_->DidStopFlinging();
 }
 
 void RenderWidgetCompositor::registerForAnimations(blink::WebLayer* layer) {
   cc::Layer* cc_layer = static_cast<cc_blink::WebLayerImpl*>(layer)->layer();
-  cc_layer->layer_animation_controller()->SetAnimationRegistrar(
-      layer_tree_host_->animation_registrar());
+  cc_layer->RegisterForAnimations(layer_tree_host_->animation_registrar());
 }
 
 void RenderWidgetCompositor::registerViewportLayers(
     const blink::WebLayer* overscrollElasticityLayer,
     const blink::WebLayer* pageScaleLayer,
     const blink::WebLayer* innerViewportScrollLayer,
     const blink::WebLayer* outerViewportScrollLayer) {
   layer_tree_host_->RegisterViewportLayers(
       // The scroll elasticity layer will only exist when using pinch virtual
       // viewports.
@@ skipping 260 matching lines @@
   cc::ContextProvider* provider =
       compositor_deps_->GetSharedMainThreadContextProvider();
   // provider can be NULL after the GPU process crashed enough times and we
   // don't want to restart it any more (falling back to software).
   if (!provider)
     return;
   provider->ContextGL()->RateLimitOffscreenContextCHROMIUM();
 }
 
 }  // namespace content