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

Unified Diff: components/html_viewer/web_layer_tree_view_impl.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase on top of extracted changes. 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
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/web_layer_tree_view_impl.cc
diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc
index ff843355472f8ef91a10e7b2648639af2a2eb769..51f424bfd65eebfc3d67e67643285338ca9d9a84 100644
--- a/components/html_viewer/web_layer_tree_view_impl.cc
+++ b/components/html_viewer/web_layer_tree_view_impl.cc
@@ -180,8 +180,7 @@ void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float page_scale_factor,
void WebLayerTreeViewImpl::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 WebLayerTreeViewImpl::registerViewportLayers(
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698