Revert 171714 - Use an auxiliary list of animation controllers.

cc/layer_tree_host.cc

Index: cc/layer_tree_host.cc
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
index 948e0b998b1f0de48f4c65ae6d73e92074b0e73d..e2cecda52b6bae89b923f1999bb95ce57ae37b5d 100644
--- a/cc/layer_tree_host.cc
+++ b/cc/layer_tree_host.cc
@@ -7,7 +7,6 @@
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
-#include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "cc/font_atlas.h"
 #include "cc/heads_up_display_layer.h"
@@ -178,6 +177,7 @@ scoped_ptr<LayerTreeHost> LayerTreeHost::create(LayerTreeHostClient* client, con
 
 LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client, const LayerTreeSettings& settings)
     : m_animating(false)
+    , m_needsAnimateLayers(false)
     , m_needsFullTreeSync(true)
     , m_client(client)
     , m_commitNumber(0)
@@ -235,9 +235,6 @@ LayerTreeHost::~LayerTreeHost()
     RateLimiterMap::iterator it = m_rateLimiters.begin();
     if (it != m_rateLimiters.end())
         it->second->stop();
-
-    if (m_rootLayer)
-        m_rootLayer = 0;
 }
 
 void LayerTreeHost::setSurfaceReady()
@@ -390,6 +387,11 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl)
     else
         hostImpl->activeTree()->set_hud_layer(0);
 
+    // We may have added an animation during the tree sync. This will cause both layer tree hosts
+    // to visit their controllers.
+    if (rootLayer() && m_needsAnimateLayers)
+        hostImpl->setNeedsAnimateLayers();
+
     hostImpl->activeTree()->set_source_frame_number(commitNumber());
     hostImpl->setViewportSize(layoutViewportSize(), deviceViewportSize());
     hostImpl->setDeviceScaleFactor(deviceScaleFactor());
@@ -523,6 +525,12 @@ void LayerTreeHost::setAnimationEvents(scoped_ptr<AnimationEventsVector> events,
     setAnimationEventsRecursive(*events.get(), m_rootLayer.get(), wallClockTime);
 }
 
+void LayerTreeHost::didAddAnimation()
+{
+    m_needsAnimateLayers = true;
+    m_proxy->didAddAnimation();
+}
+
 void LayerTreeHost::setRootLayer(scoped_refptr<Layer> rootLayer)
 {
     if (m_rootLayer == rootLayer)
@@ -925,16 +933,33 @@ void LayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
 
 void LayerTreeHost::animateLayers(base::TimeTicks time)
 {
-    if (!m_settings.acceleratedAnimationEnabled || m_activeAnimationControllers.empty())
+    if (!m_settings.acceleratedAnimationEnabled || !m_needsAnimateLayers)
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
+    m_needsAnimateLayers = animateLayersRecursive(m_rootLayer.get(), time);
+}
 
+bool LayerTreeHost::animateLayersRecursive(Layer* current, base::TimeTicks time)
+{
+    if (!current)
+        return false;
+
+    bool subtreeNeedsAnimateLayers = false;
+    LayerAnimationController* currentController = current->layerAnimationController();
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
+    currentController->animate(monotonicTime, 0);
+
+    // If the current controller still has an active animation, we must continue animating layers.
+    if (currentController->hasActiveAnimation())
+         subtreeNeedsAnimateLayers = true;
 
-    AnimationControllerSet copy = m_activeAnimationControllers;
-    for (AnimationControllerSet::iterator iter = copy.begin(); iter != copy.end(); ++iter)
-        (*iter)->animate(monotonicTime, 0);
+    for (size_t i = 0; i < current->children().size(); ++i) {
+        if (animateLayersRecursive(current->children()[i].get(), time))
+            subtreeNeedsAnimateLayers = true;
+    }
+
+    return subtreeNeedsAnimateLayers;
 }
 
 void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& events, Layer* layer, base::Time wallClockTime)
@@ -955,30 +980,4 @@ void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& eve
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
-void LayerTreeHost::DidActivateAnimationController(LayerAnimationController* controller) {
-    // Controllers register themselves when they have new animations. We need
-    // to commit in this case.
-    setNeedsCommit();
-    m_activeAnimationControllers.insert(controller);
-}
-
-void LayerTreeHost::DidDeactivateAnimationController(LayerAnimationController* controller) {
-    if (ContainsKey(m_activeAnimationControllers, controller))
-        m_activeAnimationControllers.erase(controller);
-}
-
-void LayerTreeHost::RegisterAnimationController(LayerAnimationController* controller) {
-#if !defined(NDEBUG)
-    m_allAnimationControllers.insert(controller);
-#endif
-}
-
-void LayerTreeHost::UnregisterAnimationController(LayerAnimationController* controller) {
-#if !defined(NDEBUG)
-    if (ContainsKey(m_allAnimationControllers, controller))
-        m_allAnimationControllers.erase(controller);
-#endif
-    DidDeactivateAnimationController(controller);
-}
-
 }  // namespace cc