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

Unified Diff: cc/layer_animation_controller.cc

Issue 11783037: Not for review: Enable accelerated animations for orphaned layers (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Wait for layout to complete before starting orphaned animations Created 7 years, 11 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/layer_animation_controller.h ('k') | cc/layer_animation_value_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_animation_controller.cc
diff --git a/cc/layer_animation_controller.cc b/cc/layer_animation_controller.cc
index 8efcc4f93c57db5698b7bbd850ac98dc033f09a6..c2751875bb6ef169914dc752cb17112a32128d23 100644
--- a/cc/layer_animation_controller.cc
+++ b/cc/layer_animation_controller.cc
@@ -20,6 +20,7 @@ LayerAnimationController::LayerAnimationController(int id)
, m_id(id)
, m_registrar(0)
, m_isActive(false)
+ , m_orphanWaitStatus(NeverWaitedForLayout)
{
}
@@ -130,6 +131,8 @@ void LayerAnimationController::animate(double monotonicTime, AnimationEventsVect
void LayerAnimationController::addAnimation(scoped_ptr<Animation> animation)
{
m_activeAnimations.push_back(animation.Pass());
+ if ((m_orphanWaitStatus == NeverWaitedForLayout) && !hasNonOrphanedObserver())
+ m_orphanWaitStatus = WaitingForLayout;
updateActivation();
}
@@ -207,6 +210,19 @@ void LayerAnimationController::removeObserver(LayerAnimationValueObserver* obser
m_observers.RemoveObserver(observer);
}
+bool LayerAnimationController::hasNonOrphanedObserver()
+{
+ if (m_observers.might_have_observers()) {
+ ObserverListBase<LayerAnimationValueObserver>::Iterator it(m_observers);
+ LayerAnimationValueObserver* obs;
+ while ((obs = it.GetNext()) != NULL) {
+ if (!obs->IsOrphaned())
+ return true;
+ }
+ }
+ return false;
+}
+
void LayerAnimationController::pushNewAnimationsToImplThread(LayerAnimationController* controllerImpl) const
{
// Any new animations owned by the main thread's controller are cloned and adde to the impl thread's controller.
« no previous file with comments | « cc/layer_animation_controller.h ('k') | cc/layer_animation_value_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698