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

Unified Diff: cc/layers/layer_impl.cc

Issue 13465014: LayerTreeHost::SetAnimationEvents should use AnimationRegistrar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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/layers/layer.cc ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 34334b19ca84c6b7dfaa8b8beb7e344b3e5346e0..2d5f449a8ba322d47bfed875fb18a9140e404669 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -63,7 +63,7 @@ LayerImpl::LayerImpl(LayerTreeImpl* tree_impl, int id)
AnimationRegistrar* registrar = layer_tree_impl_->animationRegistrar();
layer_animation_controller_ =
registrar->GetAnimationControllerForId(layer_id_);
- layer_animation_controller_->AddObserver(this);
+ layer_animation_controller_->AddValueObserver(this);
}
LayerImpl::~LayerImpl() {
@@ -71,7 +71,7 @@ LayerImpl::~LayerImpl() {
DCHECK(!between_will_draw_and_did_draw_);
#endif
layer_tree_impl_->UnregisterLayer(this);
- layer_animation_controller_->RemoveObserver(this);
+ layer_animation_controller_->RemoveValueObserver(this);
}
void LayerImpl::AddChild(scoped_ptr<LayerImpl> child) {
@@ -363,9 +363,6 @@ void LayerImpl::PushPropertiesTo(LayerImpl* layer) {
layer->SetStackingOrderChanged(stacking_order_changed_);
- layer_animation_controller_->PushAnimationUpdatesTo(
- layer->layer_animation_controller());
-
// Reset any state that should be cleared for the next update.
stacking_order_changed_ = false;
update_rect_ = gfx::RectF();
« no previous file with comments | « cc/layers/layer.cc ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698