Web Animations: Update naming to reflect spec changes

Source/core/animation/ElementAnimations.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 25 matching lines @@
 namespace blink {
 
 ElementAnimations::ElementAnimations()
     : m_animationStyleChange(false)
 {
 }
 
 ElementAnimations::~ElementAnimations()
 {
 #if !ENABLE(OILPAN)
-    for (Animation* animation : m_animations)
-        animation->notifyElementDestroyed();
-    m_animations.clear();
+    for (KeyframeEffect* effect : m_effects)
+        effect->notifyElementDestroyed();
+    m_effects.clear();
 #endif
 }
 
 void ElementAnimations::updateAnimationFlags(ComputedStyle& style)
 {
-    for (const auto& entry : m_players) {
-        const AnimationPlayer& player = *entry.key;
-        ASSERT(player.source());
+    for (const auto& entry : m_animations) {
+        const Animation& animation = *entry.key;
+        ASSERT(animation.source());
         // FIXME: Needs to consider AnimationGroup once added.
-        ASSERT(player.source()->isAnimation());
-        const Animation& animation = *toAnimation(player.source());
-        if (animation.isCurrent()) {
-            if (animation.affects(PropertyHandle(CSSPropertyOpacity)))
+        ASSERT(animation.source()->isAnimation());
+        const KeyframeEffect& effect = *toKeyframeEffect(animation.source());
+        if (effect.isCurrent()) {
+            if (effect.affects(PropertyHandle(CSSPropertyOpacity)))
                 style.setHasCurrentOpacityAnimation(true);
-            if (animation.affects(PropertyHandle(CSSPropertyTransform)))
+            if (effect.affects(PropertyHandle(CSSPropertyTransform)))
                 style.setHasCurrentTransformAnimation(true);
-            if (animation.affects(PropertyHandle(CSSPropertyWebkitFilter)))
+            if (effect.affects(PropertyHandle(CSSPropertyWebkitFilter)))
                 style.setHasCurrentFilterAnimation(true);
         }
     }
 
     if (style.hasCurrentOpacityAnimation())
         style.setIsRunningOpacityAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyOpacity));
     if (style.hasCurrentTransformAnimation())
         style.setIsRunningTransformAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyTransform));
     if (style.hasCurrentFilterAnimation())
         style.setIsRunningFilterAnimationOnCompositor(m_defaultStack.hasActiveAnimationsOnCompositor(CSSPropertyWebkitFilter));
 }
 
 void ElementAnimations::restartAnimationOnCompositor()
 {
-    for (const auto& entry : m_players)
+    for (const auto& entry : m_animations)
         entry.key->restartAnimationOnCompositor();
 }
 
 DEFINE_TRACE(ElementAnimations)
 {
 #if ENABLE(OILPAN)
     visitor->trace(m_cssAnimations);
     visitor->trace(m_defaultStack);
-    visitor->trace(m_players);
+    visitor->trace(m_animations);
 #endif
 }
 
 const ComputedStyle* ElementAnimations::baseComputedStyle() const
 {
 #if !ENABLE(ASSERT)
     if (isAnimationStyleChange())
         return m_baseComputedStyle.get();
 #endif
     return nullptr;
@@ skipping 22 matching lines @@
     // TODO(rune@opera.com): The FontFaceCache version number may be increased without forcing
     // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache
     // versions will not be considered equal as Font::operator== will compare versions, hence
     // ComputedStyle::operator== will return false. We avoid using baseComputedStyle (the check for
     // isFallbackValid()) in that case to avoid triggering the ComputedStyle comparison ASSERT
     // in updateBaseComputedStyle.
     return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyle->font().isFallbackValid());
 }
 
 } // namespace blink