Simplify animation testing API

Source/core/page/animation/CompositeAnimation.cpp

 /*
  * Copyright (C) 2007 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 456 matching lines @@
         CSSPropertyTransitionsMap::const_iterator transitionsEnd = m_transitions.end();
         for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) {
             ImplicitAnimation* anim = it->value.get();
             if (anim && anim->isAnimatingProperty(property, acceleratedOnly, isRunningNow))
                 return true;
         }
     }
     return false;
 }
 
-bool CompositeAnimation::pauseAnimationAtTime(const AtomicString& name, double t)
+void CompositeAnimation::pauseAnimationsForTesting(double t)
 {
     m_keyframeAnimations.checkConsistency();
 
-    RefPtr<KeyframeAnimation> keyframeAnim = m_keyframeAnimations.get(name.impl());
-    if (!keyframeAnim || !keyframeAnim->running())
-        return false;
+    AnimationNameMap::const_iterator animationsEnd = m_keyframeAnimations.end();
+    for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != animationsEnd; ++it) {
+        RefPtr<KeyframeAnimation> keyframeAnim = it->value;
+        if (!keyframeAnim || !keyframeAnim->running())
+            continue;
 
-    double count = keyframeAnim->m_animation->iterationCount();
-    if ((t >= 0.0) && ((count == CSSAnimationData::IterationCountInfinite) || (t <= count * keyframeAnim->duration()))) {
-        keyframeAnim->freezeAtTime(t);
-        return true;
+        double count = keyframeAnim->m_animation->iterationCount();
+        if ((t >= 0.0) && ((count == CSSAnimationData::IterationCountInfinite) || (t <= count * keyframeAnim->duration())))
+            keyframeAnim->freezeAtTime(t);
     }
 
-    return false;
-}
+    CSSPropertyTransitionsMap::const_iterator transitionsEnd = m_transitions.end();
+    for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) {
+        RefPtr<ImplicitAnimation> implAnim = it->value;
 
-bool CompositeAnimation::pauseTransitionAtTime(CSSPropertyID property, double t)
-{
-    if ((property < firstCSSProperty) || (property >= firstCSSProperty + numCSSProperties))
-        return false;
+        if (!implAnim->running())
+            continue;
 
-    ImplicitAnimation* implAnim = m_transitions.get(property);
-    if (!implAnim) {
-        // Check to see if this property is being animated via a shorthand.
-        // This code is only used for testing, so performance is not critical here.
-        HashSet<CSSPropertyID> shorthandProperties = CSSPropertyAnimation::animatableShorthandsAffectingProperty(property);
-        bool anyPaused = false;
-        HashSet<CSSPropertyID>::const_iterator end = shorthandProperties.end();
-        for (HashSet<CSSPropertyID>::const_iterator it = shorthandProperties.begin(); it != end; ++it) {
-            if (pauseTransitionAtTime(*it, t))
-                anyPaused = true;
-        }
-        return anyPaused;
+        if ((t >= 0.0) && (t <= implAnim->duration()))
+            implAnim->freezeAtTime(t);
     }
-
-    if (!implAnim->running())
-        return false;
-
-    if ((t >= 0.0) && (t <= implAnim->duration())) {
-        implAnim->freezeAtTime(t);
-        return true;
-    }
-
-    return false;
 }
 
 unsigned CompositeAnimation::numberOfActiveAnimations() const
 {
     unsigned count = 0;
     
     if (!m_keyframeAnimations.isEmpty()) {
         m_keyframeAnimations.checkConsistency();
         AnimationNameMap::const_iterator animationsEnd = m_keyframeAnimations.end();
         for (AnimationNameMap::const_iterator it = m_keyframeAnimations.begin(); it != animationsEnd; ++it) {
             KeyframeAnimation* anim = it->value.get();
             if (anim->running())
                 ++count;
         }
     }
 
     if (!m_transitions.isEmpty()) {
         CSSPropertyTransitionsMap::const_iterator transitionsEnd = m_transitions.end();
         for (CSSPropertyTransitionsMap::const_iterator it = m_transitions.begin(); it != transitionsEnd; ++it) {
             ImplicitAnimation* anim = it->value.get();
             if (anim->running())
                 ++count;
         }
     }
     
     return count;
 }
 
 } // namespace WebCore