Fix Animations, Remove Compostior Animations.

sky/engine/core/animation/PendingAnimations.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
  * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "sky/engine/config.h"
-#include "sky/engine/core/animation/CompositorPendingAnimations.h"
+#include "sky/engine/core/animation/PendingAnimations.h"
 
 #include "sky/engine/core/animation/Animation.h"
 #include "sky/engine/core/animation/AnimationTimeline.h"
 #include "sky/engine/core/frame/FrameView.h"
 #include "sky/engine/core/page/Page.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 
 namespace blink {
 
-void CompositorPendingAnimations::add(AnimationPlayer* player)
+void PendingAnimations::add(AnimationPlayer* player)
 {
     ASSERT(player);
     ASSERT(m_pending.find(player) == kNotFound);
     m_pending.append(player);
 
     Document* document = player->timeline()->document();
     if (document->view())
         document->view()->scheduleAnimation();
 
     bool visible = document->page() && document->page()->visibilityState() == PageVisibilityStateVisible;
     if (!visible && !m_timer.isActive()) {
         m_timer.startOneShot(0, FROM_HERE);
     }
 }
 
-bool CompositorPendingAnimations::update(bool startOnCompositor)
+bool PendingAnimations::update()
 {
     Vector<AnimationPlayer*> waitingForStartTime;
-    bool startedSynchronizedOnCompositor = false;
-
     Vector<RefPtr<AnimationPlayer> > players;
     players.swap(m_pending);
 
     for (size_t i = 0; i < players.size(); ++i) {
         AnimationPlayer& player = *players[i].get();
-        bool hadCompositorAnimation = player.hasActiveAnimationsOnCompositor();
-        player.preCommit(startOnCompositor);
-        if (player.hasActiveAnimationsOnCompositor() && !hadCompositorAnimation) {
-            startedSynchronizedOnCompositor = true;
-        }
-
+        player.preCommit();
         if (player.playing() && !player.hasStartTime()) {
             waitingForStartTime.append(&player);
         }
     }
 
-    // If any synchronized animations were started on the compositor, all
-    // remaning synchronized animations need to wait for the synchronized
-    // start time. Otherwise they may start immediately.
-    if (startedSynchronizedOnCompositor) {
-        for (size_t i = 0; i < waitingForStartTime.size(); ++i) {
-            if (!waitingForStartTime[i]->hasStartTime()) {
-                m_waitingForCompositorAnimationStart.append(waitingForStartTime[i]);
-            }
-        }
-    } else {
-        for (size_t i = 0; i < waitingForStartTime.size(); ++i) {
-            if (!waitingForStartTime[i]->hasStartTime()) {
-                waitingForStartTime[i]->notifyCompositorStartTime(waitingForStartTime[i]->timeline()->currentTimeInternal());
-            }
+    for (size_t i = 0; i < waitingForStartTime.size(); ++i) {
+        if (!waitingForStartTime[i]->hasStartTime()) {
+            waitingForStartTime[i]->notifyCompositorStartTime(waitingForStartTime[i]->timeline()->currentTimeInternal());
         }
     }
 
     // FIXME: The postCommit should happen *after* the commit, not before.
     for (size_t i = 0; i < players.size(); ++i) {
         AnimationPlayer& player = *players[i].get();
         player.postCommit(player.timeline()->currentTimeInternal());
     }
 
     ASSERT(m_pending.isEmpty());
-
-    if (startedSynchronizedOnCompositor)
-        return true;
-
-    if (m_waitingForCompositorAnimationStart.isEmpty())
-        return false;
-
-    // Check if we're still waiting for any compositor animations to start.
-    for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) {
-        if (m_waitingForCompositorAnimationStart[i].get()->hasActiveAnimationsOnCompositor())
-            return true;
-    }
-
-    // If not, go ahead and start any animations that were waiting.
-    notifyCompositorAnimationStarted(monotonicallyIncreasingTime());
-
-    ASSERT(m_pending.isEmpty());
     return false;
 }
 
-void CompositorPendingAnimations::notifyCompositorAnimationStarted(double monotonicAnimationStartTime)
-{
-    for (size_t i = 0; i < m_waitingForCompositorAnimationStart.size(); ++i) {
-        AnimationPlayer* player = m_waitingForCompositorAnimationStart[i].get();
-        if (player->hasStartTime())
-            continue;
-        player->notifyCompositorStartTime(monotonicAnimationStartTime - player->timeline()->zeroTime());
-    }
-
-    m_waitingForCompositorAnimationStart.clear();
-}
-
 } // namespace