Web Animations: Move property handle filtering into AnimationStack building

third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp

 /*
  * Copyright (C) 2006 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 80 matching lines @@
     return m_resources.get(id);
 }
 
 void SVGDocumentExtensions::serviceOnAnimationFrame(Document& document, double monotonicAnimationStartTime)
 {
     if (!document.svgExtensions())
         return;
     document.accessSVGExtensions().serviceAnimations(monotonicAnimationStartTime);
 }
 
+static bool isSVGAttributeHandle(const PropertyHandle& propertyHandle)
+{
+    return propertyHandle.isSVGAttribute();
+}
+
 void SVGDocumentExtensions::serviceAnimations(double monotonicAnimationStartTime)
 {
     if (RuntimeEnabledFeatures::smilEnabled()) {
         WillBeHeapVector<RefPtrWillBeMember<SVGSVGElement>> timeContainers;
         copyToVector(m_timeContainers, timeContainers);
         for (const auto& container : timeContainers)
             container->timeContainer()->serviceAnimations(monotonicAnimationStartTime);
     }
 
     // TODO(alancutter): Make SVG animation effect application a separate document lifecycle phase from servicing animations to be responsive to Javascript manipulation of exposed animation objects.
     for (auto& svgElement : m_webAnimatedSVGElements) {
-        ActiveInterpolationsMap activeInterpolationsMap = AnimationStack::activeInterpolations(&svgElement->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority, 0);
+        ActiveInterpolationsMap activeInterpolationsMap = AnimationStack::activeInterpolations(&svgElement->elementAnimations()->animationStack(), nullptr, nullptr, KeyframeEffect::DefaultPriority, 0, isSVGAttributeHandle);
         for (auto& entry : activeInterpolationsMap) {
-            if (!entry.key.isSVGAttribute())
-                continue;
             const QualifiedName& attribute = entry.key.svgAttribute();
             const Interpolation& interpolation = *entry.value.first();
             if (interpolation.isInvalidatableInterpolation()) {
                 RefPtrWillBeRawPtr<SVGAnimatedPropertyBase> propertyBase = svgElement->propertyFromAttribute(attribute);
                 InterpolationEnvironment environment(*svgElement, *propertyBase);
                 InvalidatableInterpolation::applyStack(entry.value, environment);
             } else {
                 // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
                 toSVGInterpolation(interpolation).apply(*svgElement);
             }
@@ skipping 262 matching lines @@
 #if ENABLE(OILPAN)
     visitor->trace(m_document);
     visitor->trace(m_timeContainers);
     visitor->trace(m_relativeLengthSVGRoots);
     visitor->trace(m_pendingResources);
     visitor->trace(m_pendingResourcesForRemoval);
 #endif
 }
 
 }