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

Unified Diff: cc/animation/element_animations.cc

Issue 1881373002: CC Animation: Erase AnimationRegistrar (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@private
Patch Set: Created 4 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
« no previous file with comments | « cc/animation/animation_registrar.cc ('k') | cc/animation/layer_animation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/element_animations.cc
diff --git a/cc/animation/element_animations.cc b/cc/animation/element_animations.cc
index fe2e65a046d993f36f9f78116b51c8da97440cff..b98244409204493b5aa8717ebc3b1991b41cf918 100644
--- a/cc/animation/element_animations.cc
+++ b/cc/animation/element_animations.cc
@@ -77,7 +77,7 @@ void ElementAnimations::CreateLayerAnimationController(int layer_id) {
layer_animation_controller_ =
animation_host_->GetAnimationControllerForId(layer_id);
- animation_host_->SetAnimationRegistrarFor(layer_animation_controller_);
+ layer_animation_controller_->SetAnimationHost(animation_host_);
layer_animation_controller_->set_layer_animation_delegate(this);
layer_animation_controller_->set_value_provider(this);
@@ -104,7 +104,7 @@ void ElementAnimations::DestroyLayerAnimationController() {
if (layer_animation_controller_) {
layer_animation_controller_->remove_value_provider(this);
layer_animation_controller_->remove_layer_animation_delegate(this);
- animation_host_->ResetAnimationRegistrarFor(layer_animation_controller_);
+ layer_animation_controller_->SetAnimationHost(nullptr);
layer_animation_controller_ = nullptr;
}
}
« no previous file with comments | « cc/animation/animation_registrar.cc ('k') | cc/animation/layer_animation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698