Push hasValidAttributeName/Type down into 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 111 matching lines @@
 }
 
 AnimatedPropertyType SVGAnimateElement::animatedPropertyType() {
   if (!targetElement())
     return AnimatedUnknown;
 
   m_animator.reset(targetElement());
   return m_animator.type();
 }
 
+bool SVGAnimateElement::hasValidTarget() {
+  return SVGAnimationElement::hasValidTarget() && hasValidAttributeName() &&
+         hasValidAttributeType();
+}
+
+bool SVGAnimateElement::hasValidAttributeName() const {
+  return attributeName() != anyQName();
+}
+
 bool SVGAnimateElement::hasValidAttributeType() {
-  SVGElement* targetElement = this->targetElement();
-  if (!targetElement)
+  if (!targetElement())
     return false;
-
   return animatedPropertyType() != AnimatedUnknown &&
          !hasInvalidCSSAttributeType();
 }
 
 SVGAnimateElement::ShouldApplyAnimationType
 SVGAnimateElement::shouldApplyAnimation(SVGElement* targetElement,
                                         const QualifiedName& attributeName) {
-  if (!hasValidAttributeType() || attributeName == anyQName() ||
-      !targetElement || !targetElement->inActiveDocument() ||
-      !targetElement->parentNode())
+  if (!hasValidTarget() || !targetElement->parentNode())
     return DontApplyAnimation;
 
   // Always animate CSS properties using the ApplyCSSAnimation code path,
   // regardless of the attributeType value.
   if (isTargetAttributeCSSProperty(*targetElement, attributeName)) {
     if (targetElement->isPresentationAttributeWithSVGDOM(attributeName))
       return ApplyXMLandCSSAnimation;
 
     return ApplyCSSAnimation;
   }
@@ skipping 311 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