Web Animations CSS: Start running animations on the compositor

Source/core/animation/css/CSSAnimations.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 15 matching lines @@
  * 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 "config.h"
 #include "core/animation/css/CSSAnimations.h"
 
 #include "StylePropertyShorthand.h"
 #include "core/animation/ActiveAnimations.h"
+#include "core/animation/CompositorAnimations.h"
 #include "core/animation/DocumentTimeline.h"
 #include "core/animation/KeyframeAnimationEffect.h"
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/events/TransitionEvent.h"
 #include "core/events/WebKitAnimationEvent.h"
 #include "core/frame/UseCounter.h"
@@ skipping 466 matching lines @@
     }
 
     for (Vector<CSSAnimationUpdate::NewAnimation>::const_iterator iter = update->newAnimations().begin(); iter != update->newAnimations().end(); ++iter) {
         OwnPtr<AnimationEventDelegate> eventDelegate = adoptPtr(new AnimationEventDelegate(element, iter->name));
         HashSet<RefPtr<Player> > players;
         for (HashSet<RefPtr<InertAnimation> >::const_iterator animationsIter = iter->animations.begin(); animationsIter != iter->animations.end(); ++animationsIter) {
             const InertAnimation* inertAnimation = animationsIter->get();
             // The event delegate is set on the the first animation only. We
             // rely on the behavior of OwnPtr::release() to achieve this.
             RefPtr<Animation> animation = Animation::create(element, inertAnimation->effect(), inertAnimation->specified(), Animation::DefaultPriority, eventDelegate.release());
-            RefPtr<Player> player = element->document().timeline()->play(animation.get());
+            RefPtr<Player> player = element->document().timeline()->createPlayer(animation.get());
             player->setPaused(inertAnimation->paused());
+            element->document().cssPendingAnimations().add(player.get());
             players.add(player.release());
         }
         m_animations.set(iter->name, players);
     }
 
     for (HashSet<CSSPropertyID>::iterator iter = update->cancelledTransitions().begin(); iter != update->cancelledTransitions().end(); ++iter) {
         ASSERT(m_transitions.contains(*iter));
         m_transitions.take(*iter).transition->player()->cancel();
     }
 
     for (size_t i = 0; i < update->newTransitions().size(); ++i) {
         const CSSAnimationUpdate::NewTransition& newTransition = update->newTransitions()[i];
 
         RunningTransition runningTransition;
         runningTransition.from = newTransition.from;
         runningTransition.to = newTransition.to;
 
         CSSPropertyID id = newTransition.id;
         InertAnimation* inertAnimation = newTransition.animation.get();
         OwnPtr<TransitionEventDelegate> eventDelegate = adoptPtr(new TransitionEventDelegate(element, id));
         RefPtr<Animation> transition = Animation::create(element, inertAnimation->effect(), inertAnimation->specified(), Animation::TransitionPriority, eventDelegate.release());
-        element->document().transitionTimeline()->play(transition.get());
+        RefPtr<Player> player = element->document().transitionTimeline()->createPlayer(transition.get());
+        element->document().cssPendingAnimations().add(player.get());
         runningTransition.transition = transition.get();
         m_transitions.set(id, runningTransition);
         ASSERT(id != CSSPropertyInvalid);
         blink::Platform::current()->histogramSparse("WebCore.Animation.CSSProperties", UseCounter::mapCSSPropertyIdToCSSSampleIdForHistogram(id));
     }
 }
 
 void CSSAnimations::calculateTransitionUpdateForProperty(CSSAnimationUpdate* update, CSSPropertyID id, const CandidateTransition& newTransition, const TransitionMap* existingTransitions)
 {
     if (existingTransitions) {
@@ skipping 123 matching lines @@
     }
 
     // Properties being animated by animations don't get values from transitions applied.
     if (!update->compositableValuesForAnimations().isEmpty() && !compositableValuesForTransitions.isEmpty()) {
         for (AnimationEffect::CompositableValueMap::const_iterator iter = update->compositableValuesForAnimations().begin(); iter != update->compositableValuesForAnimations().end(); ++iter)
             compositableValuesForTransitions.remove(iter->key);
     }
     update->adoptCompositableValuesForTransitions(compositableValuesForTransitions);
 }
 
+bool CSSAnimations::hasPendingCandidateWhichShouldComposite(bool inCompositingMode) const
+{
+    if (!m_pendingUpdate)
+        return false;
+
+    for (size_t i = 0; i < m_pendingUpdate->newAnimations().size(); ++i) {
+        HashSet<RefPtr<InertAnimation> > animations = m_pendingUpdate->newAnimations()[i].animations;
+        for (HashSet<RefPtr<InertAnimation> >::const_iterator it = animations.begin(); it != animations.end(); ++it) {
+            ASSERT((*it)->effect());
+            AnimationEffect* effect = (*it)->effect();
+            // FIXME: Perhaps pass a predicate funciton so that we can remove the explicit checks from this file?
+            if ((effect->affects(CSSPropertyOpacity) && inCompositingMode)
+                || effect->affects(CSSPropertyWebkitTransform)
+                || effect->affects(CSSPropertyWebkitFilter))
+                return true;
+        }
+    }
+
+    for (size_t i = 0; i < m_pendingUpdate->newTransitions().size(); ++i) {
+        AnimationEffect* effect = m_pendingUpdate->newTransitions()[i].animation->effect();
+        if ((effect->affects(CSSPropertyOpacity) && inCompositingMode)
+            || effect->affects(CSSPropertyWebkitTransform)
+            || effect->affects(CSSPropertyWebkitFilter))
+            return true;

[Steve Block, 2013/11/18 05:03:03]

It's a shame that the logic regarding these 3 properties is repeated twice here
and then again in shouldCompositeForAnimation(). Can we share it?

[dstockwell, 2013/11/18 06:11:20]

There's a FIXME on line 702 with a possible solution.

+    }
+
+    return false;
+}
+
 void CSSAnimations::AnimationEventDelegate::maybeDispatch(Document::ListenerType listenerType, const AtomicString& eventName, double elapsedTime)
 {
     if (m_target->document().hasListenerType(listenerType))
         m_target->document().timeline()->addEventToDispatch(m_target, WebKitAnimationEvent::create(eventName, m_name, elapsedTime));
 }
 
 void CSSAnimations::AnimationEventDelegate::onEventCondition(const TimedItem* timedItem, bool isFirstSample, TimedItem::Phase previousPhase, double previousIteration)
 {
     // Events for a single document are queued and dispatched as a group at
     // the end of DocumentTimeline::serviceAnimations.
@@ skipping 176 matching lines @@
             CSSPropertyID id = convertToCSSPropertyID(i);
             if (isAnimatableProperty(id))
                 properties.append(id);
         }
         propertyShorthand = StylePropertyShorthand(CSSPropertyInvalid, properties.begin(), properties.size());
     }
     return propertyShorthand;
 }
 
 } // namespace WebCore