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

Unified Diff: ui/compositor/compositor.cc

Issue 2216203002: Refactor MutatorHostClient from LayerTreeHost to LayerTree. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix call site in cc_perftest. Created 4 years, 4 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: ui/compositor/compositor.cc
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index ee97043586cc958c5b13abb60f90abc968c57d87..fcc77893e3b23897825e4898cb5406dc35a14be9 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -215,7 +215,8 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
animation_timeline_ =
cc::AnimationTimeline::Create(cc::AnimationIdProvider::NextTimelineId());
- host_->animation_host()->AddAnimationTimeline(animation_timeline_.get());
+ host_->GetLayerTree()->animation_host()
+ ->AddAnimationTimeline(animation_timeline_.get());
host_->SetRootLayer(root_web_layer_);
host_->set_surface_client_id(surface_id_allocator_->client_id());
@@ -238,7 +239,8 @@ Compositor::~Compositor() {
root_layer_->ResetCompositor();
if (animation_timeline_)
- host_->animation_host()->RemoveAnimationTimeline(animation_timeline_.get());
+ host_->GetLayerTree()->animation_host()
+ ->RemoveAnimationTimeline(animation_timeline_.get());
// Stop all outstanding draws before telling the ContextFactory to tear
// down any contexts that the |host_| may rely upon.

Powered by Google App Engine
This is Rietveld 408576698