Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1167)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/gpu/render_widget_compositor.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/layers/layer.cc ('K') | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | ui/compositor/compositor.h » ('j') | ui/compositor/layer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.cc
diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
index 31aa6a8b643d6ad935ecf96660ced934b2f6e524..9918c8c095b825e020864d24a9ada7e3373df2a7 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -647,8 +647,8 @@ void RenderWidgetCompositor::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(),
+ layer_tree_host_->settings());
}
void RenderWidgetCompositor::registerViewportLayers(
« cc/layers/layer.cc ('K') | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | ui/compositor/compositor.h » ('j') | ui/compositor/layer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698