Not for review: Enable accelerated animations for orphaned layers

cc/layer_tree_host.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 72 matching lines @@
     , m_debugState(settings.initialDebugState)
     , m_deviceScaleFactor(1)
     , m_visible(true)
     , m_pageScaleFactor(1)
     , m_minPageScaleFactor(1)
     , m_maxPageScaleFactor(1)
     , m_triggerIdleUpdates(true)
     , m_backgroundColor(SK_ColorWHITE)
     , m_hasTransparentBackground(false)
     , m_partialTextureUpdateRequests(0)
-    , m_animationRegistrar(AnimationRegistrar::create())
 {
+    if (m_settings.acceleratedAnimationEnabled)
+        m_animationRegistrar = AnimationRegistrar::create();
     numLayerTreeInstances++;
 }
 
 bool LayerTreeHost::initialize(scoped_ptr<Thread> implThread)
 {
     if (implThread)
         return initializeProxy(ThreadProxy::create(this, implThread.Pass()));
     else
         return initializeProxy(SingleThreadProxy::create(this));
 }
@@ skipping 107 matching lines @@
 {
     DCHECK(m_proxy->isMainThread());
     m_proxy->acquireLayerTextures();
 }
 
 void LayerTreeHost::didBeginFrame()
 {
     m_client->didBeginFrame();
 }
 
-void LayerTreeHost::updateAnimations(base::TimeTicks frameBeginTime)
+void LayerTreeHost::updateAnimations(base::TimeTicks monotonicFrameBeginTime, base::Time wallClockFrameBeginTime)
 {
     m_animating = true;
-    m_client->animate((frameBeginTime - base::TimeTicks()).InSecondsF());
-    animateLayers(frameBeginTime);
+    m_client->animate((monotonicFrameBeginTime - base::TimeTicks()).InSecondsF());
+    animateLayers(monotonicFrameBeginTime, wallClockFrameBeginTime);
     m_animating = false;
 
     m_renderingStats.numAnimationFrames++;
 }
 
 void LayerTreeHost::didStopFlinging()
 {
   m_proxy->mainThreadHasStoppedFlinging();
 }
 
@@ skipping 591 matching lines @@
     setNeedsCommit();
 }
 
 bool LayerTreeHost::blocksPendingCommit() const
 {
     if (!m_rootLayer)
         return false;
     return m_rootLayer->blocksPendingCommitRecursive();
 }
 
-void LayerTreeHost::animateLayers(base::TimeTicks time)
+void LayerTreeHost::didUpdateLayout()
+{
+    AnimationRegistrar::AnimationControllerMap copy = m_animationRegistrar->active_animation_controllers();
+    for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter) {
+        if ((*iter).second->orphanWaitStatus() == LayerAnimationController::WaitingForLayout)
+            (*iter).second->setOrphanWaitStatus(LayerAnimationController::WaitedForLayout);
+    }
+}
+
+void LayerTreeHost::animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime)
 {
     if (!m_settings.acceleratedAnimationEnabled || m_animationRegistrar->active_animation_controllers().empty())
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
 
-    double monotonicTime = (time - base::TimeTicks()).InSecondsF();
+    double monotonicTimeInSeconds = (monotonicTime - base::TimeTicks()).InSecondsF();
 
+    scoped_ptr<AnimationEventsVector> events(make_scoped_ptr(new AnimationEventsVector));
     AnimationRegistrar::AnimationControllerMap copy = m_animationRegistrar->active_animation_controllers();
-    for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter)
-        (*iter).second->animate(monotonicTime, 0);
+    for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter) {
+        if ((*iter).second->hasNonOrphanedObserver())
+            (*iter).second->animate(monotonicTimeInSeconds, 0);
+        else if ((*iter).second->orphanWaitStatus() == LayerAnimationController::WaitedForLayout)
+            (*iter).second->animate(monotonicTimeInSeconds, events.get());
+    }
+
+    if (!events->empty())
+        setAnimationEvents(events.Pass(), wallClockTime);
 }
 
 void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& events, Layer* layer, base::Time wallClockTime)
 {
     if (!layer)
         return;
 
     for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
         if (layer->id() == events[eventIndex].layerId) {
             if (events[eventIndex].type == AnimationEvent::Started)
                 layer->notifyAnimationStarted(events[eventIndex], wallClockTime.ToDoubleT());
             else
                 layer->notifyAnimationFinished(wallClockTime.ToDoubleT());
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture()
 {
     return m_proxy->capturePicture();
 }
 
 }  // namespace cc