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

Unified Diff: ui/compositor/layer.cc

Issue 2363733004: UI Compositor Animation: Remove cc::ElementAnimations state storage. (Closed)
Patch Set: Reparent. Created 4 years, 2 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/animation/animation_host.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer.cc
diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
index 7667b1efe8923fb8a311f232ceeab6e59071ba13..67886fcbe8c2c8c4bd925112d08d31cf7435f6a4 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -223,7 +223,7 @@ void Layer::SetAnimator(LayerAnimator* animator) {
if (animator_) {
if (compositor)
- animator_->ResetCompositor(compositor);
+ animator_->DetachLayerAndTimeline(compositor);
animator_->SetDelegate(nullptr);
}
@@ -232,7 +232,7 @@ void Layer::SetAnimator(LayerAnimator* animator) {
if (animator_) {
animator_->SetDelegate(this);
if (compositor)
- animator_->SetCompositor(compositor);
+ animator_->AttachLayerAndTimeline(compositor);
}
}
@@ -1056,7 +1056,7 @@ void Layer::SetCompositorForAnimatorsInTree(Compositor* compositor) {
if (animator_) {
if (animator_->is_animating())
animator_->AddToCollection(collection);
- animator_->SetCompositor(compositor);
+ animator_->AttachLayerAndTimeline(compositor);
}
for (auto* child : children_)
@@ -1068,7 +1068,7 @@ void Layer::ResetCompositorForAnimatorsInTree(Compositor* compositor) {
LayerAnimatorCollection* collection = compositor->layer_animator_collection();
if (animator_) {
- animator_->ResetCompositor(compositor);
+ animator_->DetachLayerAndTimeline(compositor);
animator_->RemoveFromCollection(collection);
}
« no previous file with comments | « cc/animation/animation_host.cc ('k') | ui/compositor/layer_animator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698