Fix Animations, Remove Compostior Animations.

sky/engine/core/animation/Animation.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 19 matching lines @@
 
 #include "sky/engine/config.h"
 #include "sky/engine/core/animation/Animation.h"
 
 #include "sky/engine/bindings/core/v8/Dictionary.h"
 #include "sky/engine/bindings/core/v8/ExceptionState.h"
 #include "sky/engine/core/animation/ActiveAnimations.h"
 #include "sky/engine/core/animation/AnimationHelpers.h"
 #include "sky/engine/core/animation/AnimationPlayer.h"
 #include "sky/engine/core/animation/AnimationTimeline.h"
-#include "sky/engine/core/animation/CompositorAnimations.h"
 #include "sky/engine/core/animation/Interpolation.h"
 #include "sky/engine/core/animation/KeyframeEffectModel.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/frame/UseCounter.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 
 namespace blink {
 
 PassRefPtr<Animation> Animation::create(Element* target, PassRefPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)
 {
@@ skipping 70 matching lines @@
     if (m_sampledEffect)
         clearEffects();
     AnimationNode::detach();
 }
 
 void Animation::specifiedTimingChanged()
 {
     if (player()) {
         // FIXME: Needs to consider groups when added.
         ASSERT(player()->source() == this);
-        player()->setCompositorPending(true);
+        player()->setPending();
     }
 }
 
 static AnimationStack& ensureAnimationStack(Element* element)
 {
     return element->ensureActiveAnimations().defaultStack();
 }
 
 void Animation::applyEffects()
 {
@@ skipping 19 matching lines @@
     m_target->setNeedsAnimationStyleRecalc();
 }
 
 void Animation::clearEffects()
 {
     ASSERT(player());
     ASSERT(m_sampledEffect);
 
     m_sampledEffect->clear();
     m_sampledEffect = nullptr;
-    cancelAnimationOnCompositor();
     m_target->setNeedsAnimationStyleRecalc();
     invalidate();
 }
 
 void Animation::updateChildrenAndEffects() const
 {
     if (!m_effect)
         return;
     if (isInEffect())
         const_cast<Animation*>(this)->applyEffects();
     else if (m_sampledEffect)
         const_cast<Animation*>(this)->clearEffects();
 }
 
 double Animation::calculateTimeToEffectChange(bool forwards, double localTime, double timeToNextIteration) const
 {
     const double start = startTimeInternal() + specifiedTiming().startDelay;
     const double end = start + activeDurationInternal();
 
     switch (phase()) {
     case PhaseBefore:
         ASSERT(start >= localTime);
         return forwards
             ? start - localTime
             : std::numeric_limits<double>::infinity();
     case PhaseActive:
-        if (forwards && hasActiveAnimationsOnCompositor()) {
-            ASSERT(specifiedTiming().playbackRate == 1);
-            // Need service to apply fill / fire events.
-            const double timeToEnd = end - localTime;
-            if (hasEvents()) {
-                return std::min(timeToEnd, timeToNextIteration);
-            } else {
-                return timeToEnd;
-            }
-        }
         return 0;
     case PhaseAfter:
         ASSERT(localTime >= end);
         // If this Animation is still in effect then it will need to update
         // when its parent goes out of effect. We have no way of knowing when
         // that will be, however, so the parent will need to supply it.
         return forwards
             ? std::numeric_limits<double>::infinity()
             : localTime - end;
     default:
@@ skipping 14 matching lines @@
     // destructor called when we call SampledEffect::clear(), so we need to
     // clear m_sampledEffect first.
     m_target = nullptr;
     clearEventDelegate();
     SampledEffect* sampledEffect = m_sampledEffect;
     m_sampledEffect = nullptr;
     if (sampledEffect)
         sampledEffect->clear();
 }
 
-bool Animation::isCandidateForAnimationOnCompositor() const
-{
-    if (!effect() || !m_target)
-        return false;
-    return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *effect());
-}
-
-bool Animation::maybeStartAnimationOnCompositor(double startTime, double currentTime)
-{
-    ASSERT(!hasActiveAnimationsOnCompositor());
-    if (!isCandidateForAnimationOnCompositor())
-        return false;
-    if (!CompositorAnimations::instance()->canStartAnimationOnCompositor(*m_target))
-        return false;
-    if (!CompositorAnimations::instance()->startAnimationOnCompositor(*m_target, startTime, currentTime, specifiedTiming(), *effect(), m_compositorAnimationIds))
-        return false;
-    ASSERT(!m_compositorAnimationIds.isEmpty());
-    return true;
-}
-
-bool Animation::hasActiveAnimationsOnCompositor() const
-{
-    return !m_compositorAnimationIds.isEmpty();
-}
-
-bool Animation::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
-{
-    return hasActiveAnimationsOnCompositor() && affects(property);
-}
-
-bool Animation::affects(CSSPropertyID property) const
-{
-    return m_effect && m_effect->affects(property);
-}
-
-void Animation::cancelAnimationOnCompositor()
-{
-    if (!hasActiveAnimationsOnCompositor())
-        return;
-    if (!m_target || !m_target->renderer())
-        return;
-    for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i)
-        CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, m_compositorAnimationIds[i]);
-    m_compositorAnimationIds.clear();
-    player()->setCompositorPending(true);
-}
-
-void Animation::pauseAnimationForTestingOnCompositor(double pauseTime)
-{
-    ASSERT(hasActiveAnimationsOnCompositor());
-    if (!m_target || !m_target->renderer())
-        return;
-    for (size_t i = 0; i < m_compositorAnimationIds.size(); ++i)
-        CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, m_compositorAnimationIds[i], pauseTime);
-}
-
 } // namespace blink