Simplify animation testing API

Source/core/page/animation/CSSPropertyAnimation.cpp

 /*
  * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Adobe Systems Incorporated. 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. 
@@ skipping 1190 matching lines @@
     size_t n = gPropertyWrappers->size();
     for (unsigned int i = 0; i < n; ++i) {
         ASSERT((*gPropertyWrappers)[i]->property() - firstCSSProperty < numCSSProperties);
         gPropertyWrapperMap[(*gPropertyWrappers)[i]->property() - firstCSSProperty] = i;
     }
 
     // Now add the shorthand wrappers.
     addShorthandProperties();
 }
 
-static bool gatherEnclosingShorthandProperties(CSSPropertyID property, AnimationPropertyWrapperBase* wrapper, HashSet<CSSPropertyID>& propertySet)
-{
-    if (!wrapper->isShorthandWrapper())
-        return false;
-
-    ShorthandPropertyWrapper* shorthandWrapper = static_cast<ShorthandPropertyWrapper*>(wrapper);
-
-    bool contained = false;
-    for (size_t i = 0; i < shorthandWrapper->propertyWrappers().size(); ++i) {
-        AnimationPropertyWrapperBase* currWrapper = shorthandWrapper->propertyWrappers()[i];
-
-        if (gatherEnclosingShorthandProperties(property, currWrapper, propertySet) || currWrapper->property() == property)
-            contained = true;
-    }
-
-    if (contained)
-        propertySet.add(wrapper->property());
-
-    return contained;
-}
-
 // Returns true if we need to start animation timers
 bool CSSPropertyAnimation::blendProperties(const AnimationBase* anim, CSSPropertyID prop, RenderStyle* dst, const RenderStyle* a, const RenderStyle* b, double progress)
 {
     ASSERT(prop != CSSPropertyInvalid);
 
     ensurePropertyMap();
 
     AnimationPropertyWrapperBase* wrapper = wrapperForProperty(prop);
     if (wrapper) {
         wrapper->blend(anim, dst, a, b, progress);
         return !wrapper->animationIsAccelerated() || !anim->isAccelerated();
     }
 
     return false;
 }
 
 bool CSSPropertyAnimation::animationOfPropertyIsAccelerated(CSSPropertyID prop)
 {
     ensurePropertyMap();
     AnimationPropertyWrapperBase* wrapper = wrapperForProperty(prop);
     return wrapper ? wrapper->animationIsAccelerated() : false;
 }
 
-// Note: this is inefficient. It's only called from pauseTransitionAtTime().
-HashSet<CSSPropertyID> CSSPropertyAnimation::animatableShorthandsAffectingProperty(CSSPropertyID property)
-{
-    ensurePropertyMap();
-
-    HashSet<CSSPropertyID> foundProperties;
-    for (int i = 0; i < getNumProperties(); ++i)
-        gatherEnclosingShorthandProperties(property, (*gPropertyWrappers)[i], foundProperties);
-
-    return foundProperties;
-}
-
 bool CSSPropertyAnimation::propertiesEqual(CSSPropertyID prop, const RenderStyle* a, const RenderStyle* b)
 {
     ensurePropertyMap();
 
     AnimationPropertyWrapperBase* wrapper = wrapperForProperty(prop);
     if (wrapper)
         return wrapper->equals(a, b);
     return true;
 }
 
@@ skipping 10 matching lines @@
 }
 
 int CSSPropertyAnimation::getNumProperties()
 {
     ensurePropertyMap();
 
     return gPropertyWrappers->size();
 }
 
 }