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

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: Use per-process global variable to create LAC Created 5 years, 7 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
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 f3f6489daee1f0e3dec61487b979322f8e8fe52d..f4ff8fa0af5f353567d5ca34bc3687e79b16a13c 100644
--- a/content/renderer/gpu/render_widget_compositor.cc
+++ b/content/renderer/gpu/render_widget_compositor.cc
@@ -661,8 +661,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(

Powered by Google App Engine
This is Rietveld 408576698