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

Unified Diff: ui/compositor/layer.cc

Issue 12517003: cc: Chromify the Animation and LayerAnimationController classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | « ui/compositor/float_animation_curve_adapter.cc ('k') | ui/compositor/layer_animation_element.cc » ('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 4d76470338312801598b5dd244e56861a184954d..49a37244eee08d1231af007dfc794c1528b2a6d6 100644
--- a/ui/compositor/layer.cc
+++ b/ui/compositor/layer.cc
@@ -812,7 +812,7 @@ void Layer::AddThreadedAnimation(scoped_ptr<cc::Animation> animation) {
// Until this layer has a compositor (and hence cc_layer_ has a
// LayerTreeHost), addAnimation will fail.
if (GetCompositor())
- cc_layer_->addAnimation(animation.Pass());
+ cc_layer_->AddAnimation(animation.Pass());
else
pending_threaded_animations_.push_back(animation.Pass());
}
@@ -836,7 +836,7 @@ struct HasAnimationId {
void Layer::RemoveThreadedAnimation(int animation_id) {
DCHECK(cc_layer_);
if (pending_threaded_animations_.size() == 0) {
- cc_layer_->removeAnimation(animation_id);
+ cc_layer_->RemoveAnimation(animation_id);
return;
}
@@ -853,7 +853,7 @@ void Layer::SendPendingThreadedAnimations() {
pending_threaded_animations_.begin();
it != pending_threaded_animations_.end();
++it)
- cc_layer_->addAnimation(pending_threaded_animations_.take(it));
+ cc_layer_->AddAnimation(pending_threaded_animations_.take(it));
pending_threaded_animations_.clear();
« no previous file with comments | « ui/compositor/float_animation_curve_adapter.cc ('k') | ui/compositor/layer_animation_element.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698