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

Unified Diff: ui/compositor/layer_animator_collection.cc

Issue 427103002: compositor: Add rAF-like functionality for the UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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/layer_animator_collection.h ('k') | ui/compositor/layer_animator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animator_collection.cc
diff --git a/ui/compositor/layer_animator_collection.cc b/ui/compositor/layer_animator_collection.cc
index 12142d88827175352af7545b0924940c5ff6eaa4..babdcb6f6b2bb0b2ba8f7992f2aebdaa96009d76 100644
--- a/ui/compositor/layer_animator_collection.cc
+++ b/ui/compositor/layer_animator_collection.cc
@@ -7,18 +7,19 @@
#include <set>
#include "base/time/time.h"
+#include "ui/compositor/compositor.h"
#include "ui/compositor/layer_animator.h"
#include "ui/gfx/frame_time.h"
namespace ui {
-LayerAnimatorCollection::LayerAnimatorCollection(
- LayerAnimatorCollectionDelegate* delegate)
- : delegate_(delegate),
- last_tick_time_(gfx::FrameTime::Now()) {
+LayerAnimatorCollection::LayerAnimatorCollection(Compositor* compositor)
+ : compositor_(compositor), last_tick_time_(gfx::FrameTime::Now()) {
}
LayerAnimatorCollection::~LayerAnimatorCollection() {
+ if (compositor_ && compositor_->HasAnimationObserver(this))
+ compositor_->RemoveAnimationObserver(this);
}
void LayerAnimatorCollection::StartAnimator(
@@ -27,21 +28,23 @@ void LayerAnimatorCollection::StartAnimator(
if (!animators_.size())
last_tick_time_ = gfx::FrameTime::Now();
animators_.insert(animator);
- if (delegate_)
- delegate_->ScheduleAnimationForLayerCollection();
+ if (animators_.size() == 1U && compositor_)
+ compositor_->AddAnimationObserver(this);
}
void LayerAnimatorCollection::StopAnimator(
scoped_refptr<LayerAnimator> animator) {
DCHECK_GT(animators_.count(animator), 0U);
animators_.erase(animator);
+ if (animators_.empty() && compositor_)
+ compositor_->RemoveAnimationObserver(this);
}
bool LayerAnimatorCollection::HasActiveAnimators() const {
return !animators_.empty();
}
-void LayerAnimatorCollection::Progress(base::TimeTicks now) {
+void LayerAnimatorCollection::OnAnimationStep(base::TimeTicks now) {
last_tick_time_ = now;
std::set<scoped_refptr<LayerAnimator> > list = animators_;
for (std::set<scoped_refptr<LayerAnimator> >::iterator iter = list.begin();
@@ -51,6 +54,8 @@ void LayerAnimatorCollection::Progress(base::TimeTicks now) {
if (animators_.count(*iter) > 0)
(*iter)->Step(now);
}
+ if (!HasActiveAnimators() && compositor_)
+ compositor_->RemoveAnimationObserver(this);
}
} // namespace ui
« no previous file with comments | « ui/compositor/layer_animator_collection.h ('k') | ui/compositor/layer_animator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698