Web Animations: Move property handle filtering into AnimationStack building

third_party/WebKit/Source/core/animation/AnimationStack.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 @@
 #include "core/animation/css/CSSAnimations.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/BitArray.h"
 #include "wtf/NonCopyingSort.h"
 #include <algorithm>
 
 namespace blink {
 
 namespace {
 
-void copyToActiveInterpolationsMap(const Vector<RefPtr<Interpolation>>& source, ActiveInterpolationsMap& target)
+void copyToActiveInterpolationsMap(const Vector<RefPtr<Interpolation>>& source, AnimationStack::PropertyHandleFilter propertyHandleFilter, ActiveInterpolationsMap& target)
 {
     for (const auto& interpolation : source) {
+        if (propertyHandleFilter && !propertyHandleFilter(interpolation->property()))
+            continue;
         ActiveInterpolationsMap::AddResult entry = target.add(interpolation->property(), ActiveInterpolations(1));
         ActiveInterpolations& activeInterpolations = entry.storedValue->value;
         if (!entry.isNewEntry
             && RuntimeEnabledFeatures::stackedCSSPropertyAnimationsEnabled()
             && interpolation->isInvalidatableInterpolation()
             && toInvalidatableInterpolation(*interpolation).dependsOnUnderlyingValue()) {
             activeInterpolations.append(interpolation.get());
         } else {
             activeInterpolations.at(0) = interpolation.get();
         }
     }
 }
 
 bool compareEffects(const Member<SampledEffect>& effect1, const Member<SampledEffect>& effect2)
 {
     ASSERT(effect1 && effect2);
     return effect1->sequenceNumber() < effect2->sequenceNumber();
 }
 
-void copyNewAnimationsToActiveInterpolationsMap(const HeapVector<Member<InertEffect>>& newAnimations, ActiveInterpolationsMap& result)
+void copyNewAnimationsToActiveInterpolationsMap(const HeapVector<Member<InertEffect>>& newAnimations, AnimationStack::PropertyHandleFilter propertyHandleFilter, ActiveInterpolationsMap& result)
 {
     for (const auto& newAnimation : newAnimations) {
         Vector<RefPtr<Interpolation>> sample;
         newAnimation->sample(sample);
         if (!sample.isEmpty())
-            copyToActiveInterpolationsMap(sample, result);
+            copyToActiveInterpolationsMap(sample, propertyHandleFilter, result);
     }
 }
 
 } // namespace
 
 AnimationStack::AnimationStack()
 {
 }
 
 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
 {
     for (const auto& sampledEffect : m_effects) {
         // TODO(dstockwell): move the playing check into AnimationEffect and expose both hasAnimations and hasActiveAnimations
         if (sampledEffect->effect() && sampledEffect->effect()->animation()->playing() && sampledEffect->effect()->hasActiveAnimationsOnCompositor(property))
             return true;
     }
     return false;
 }
 
-ActiveInterpolationsMap AnimationStack::activeInterpolations(AnimationStack* animationStack, const HeapVector<Member<InertEffect>>* newAnimations, const HeapHashSet<Member<const Animation>>* suppressedAnimations, KeyframeEffect::Priority priority)
+ActiveInterpolationsMap AnimationStack::activeInterpolations(AnimationStack* animationStack, const HeapVector<Member<InertEffect>>* newAnimations, const HeapHashSet<Member<const Animation>>* suppressedAnimations, KeyframeEffect::Priority priority, PropertyHandleFilter propertyHandleFilter)
 {
     ActiveInterpolationsMap result;
 
     if (animationStack) {
         HeapVector<Member<SampledEffect>>& effects = animationStack->m_effects;
         // std::sort doesn't work with OwnPtrs
         nonCopyingSort(effects.begin(), effects.end(), compareEffects);
         animationStack->removeClearedEffects();
         for (const auto& effect : effects) {
             if (effect->priority() != priority || (suppressedAnimations && effect->effect() && suppressedAnimations->contains(effect->effect()->animation())))
                 continue;
-            copyToActiveInterpolationsMap(effect->interpolations(), result);
+            copyToActiveInterpolationsMap(effect->interpolations(), propertyHandleFilter, result);
         }
     }
 
     if (newAnimations)
-        copyNewAnimationsToActiveInterpolationsMap(*newAnimations, result);
+        copyNewAnimationsToActiveInterpolationsMap(*newAnimations, propertyHandleFilter, result);
 
     return result;
 }
 
 void AnimationStack::removeClearedEffects()
 {
     size_t dest = 0;
     for (auto& effect : m_effects) {
         if (effect->effect())
             m_effects[dest++].swap(effect);
@@ skipping 19 matching lines @@
             FloatBox expandingBox(originalBox);
             if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expandingBox, *effect->model(), startRange, endRange))
                 return false;
             box.expandTo(expandingBox);
         }
     }
     return true;
 }
 
 } // namespace blink