Move isTargetAttributeCSSProperty to SVGAnimateElement

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

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * 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 16 matching lines @@
 #include "core/css/StylePropertySet.h"
 #include "core/dom/Document.h"
 #include "core/dom/QualifiedName.h"
 #include "core/dom/StyleChangeReason.h"
 #include "core/svg/properties/SVGProperty.h"
 
 namespace blink {
 
 namespace {
 
+bool isTargetAttributeCSSProperty(SVGElement& targetElement,
+                                  const QualifiedName& attributeName) {
+  return SVGElement::isAnimatableCSSProperty(attributeName) ||
+         targetElement.isPresentationAttribute(attributeName);
+}
+
 String computeCSSPropertyValue(SVGElement* element, CSSPropertyID id) {
   DCHECK(element);
   // TODO(fs): StyleEngine doesn't support document without a frame.
   // Refer to comment in Element::computedStyle.
   DCHECK(element->inActiveDocument());
 
   // Don't include any properties resulting from CSS Transitions/Animations or
   // SMIL animations, as we want to retrieve the "base value".
   element->setUseOverrideComputedStyle(true);
   String value =
@@ skipping 88 matching lines @@
 SVGAnimateElement::ShouldApplyAnimationType
 SVGAnimateElement::shouldApplyAnimation(SVGElement* targetElement,
                                         const QualifiedName& attributeName) {
   if (!hasValidAttributeType() || attributeName == anyQName() ||
       !targetElement || !targetElement->inActiveDocument() ||
       !targetElement->parentNode())
     return DontApplyAnimation;
 
   // Always animate CSS properties using the ApplyCSSAnimation code path,
   // regardless of the attributeType value.
-  if (isTargetAttributeCSSProperty(targetElement, attributeName)) {
+  if (isTargetAttributeCSSProperty(*targetElement, attributeName)) {
     if (targetElement->isPresentationAttributeWithSVGDOM(attributeName))
       return ApplyXMLandCSSAnimation;
 
     return ApplyCSSAnimation;
   }
   // If attributeType="CSS" and attributeName doesn't point to a CSS property,
   // ignore the animation.
   if (getAttributeType() == AttributeTypeCSS)
     return DontApplyAnimation;
 
@@ skipping 124 matching lines @@
   if (shouldApply == ApplyXMLAnimation ||
       shouldApply == ApplyXMLandCSSAnimation) {
     // SVG DOM animVal animation code-path.
     m_animatedProperty = m_animator.createAnimatedValue();
     targetElement->setAnimatedAttribute(attributeName, m_animatedProperty);
     return;
   }
   DCHECK_EQ(shouldApply, ApplyCSSAnimation);
 
   // CSS properties animation code-path.
-  DCHECK(isTargetAttributeCSSProperty(targetElement, attributeName));
+  DCHECK(isTargetAttributeCSSProperty(*targetElement, attributeName));
   String baseValue = computeCSSPropertyValue(
       targetElement, cssPropertyID(attributeName.localName()));
   m_animatedProperty = m_animator.createPropertyForAnimation(baseValue);
 }
 
 void SVGAnimateElement::clearAnimatedType() {
   if (!m_animatedProperty)
     return;
 
   // The animated property lock is held for the "result animation" (see
@@ skipping 126 matching lines @@
     m_attributeType = AttributeTypeXML;
   else
     m_attributeType = AttributeTypeAuto;
   checkInvalidCSSAttributeType();
 }
 
 void SVGAnimateElement::checkInvalidCSSAttributeType() {
   bool hasInvalidCSSAttributeType =
       targetElement() && hasValidAttributeName() &&
       getAttributeType() == AttributeTypeCSS &&
-      !isTargetAttributeCSSProperty(targetElement(), attributeName());
+      !isTargetAttributeCSSProperty(*targetElement(), attributeName());
 
   if (hasInvalidCSSAttributeType != m_hasInvalidCSSAttributeType) {
     if (hasInvalidCSSAttributeType)
       unscheduleIfScheduled();
 
     m_hasInvalidCSSAttributeType = hasInvalidCSSAttributeType;
 
     if (!hasInvalidCSSAttributeType)
       schedule();
   }
@@ skipping 14 matching lines @@
 DEFINE_TRACE(SVGAnimateElement) {
   visitor->trace(m_fromProperty);
   visitor->trace(m_toProperty);
   visitor->trace(m_toAtEndOfDurationProperty);
   visitor->trace(m_animatedProperty);
   visitor->trace(m_animator);
   SVGAnimationElement::trace(visitor);
 }
 
 }  // namespace blink