Remove SVGAnimateElement::hasValidAttributeType

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 146 matching lines @@
 }
 
 AnimatedPropertyType SVGAnimateElement::animatedPropertyType() {
   if (!targetElement())
     return AnimatedUnknown;
   resolveTargetProperty();
   return m_type;
 }
 
 bool SVGAnimateElement::hasValidTarget() {
-  return SVGAnimationElement::hasValidTarget() && hasValidAttributeName() &&
-         hasValidAttributeType();
+  if (!SVGAnimationElement::hasValidTarget())
+    return false;
+  if (!hasValidAttributeName())
+    return false;
+  resolveTargetProperty();
+  return m_type != AnimatedUnknown && !m_hasInvalidCSSAttributeType;
 }
 
 bool SVGAnimateElement::hasValidAttributeName() const {
   return attributeName() != anyQName();
 }
 
-bool SVGAnimateElement::hasValidAttributeType() {
-  if (!targetElement())
-    return false;
-  return animatedPropertyType() != AnimatedUnknown &&
-         !hasInvalidCSSAttributeType();
-}
-
 bool SVGAnimateElement::shouldApplyAnimation(
     const SVGElement& targetElement,
     const QualifiedName& attributeName) {
   if (!hasValidTarget() || !targetElement.parentNode())
     return false;
 
   // Always animate CSS properties using the ApplyCSSAnimation code path,
   // regardless of the attributeType value.
   if (isTargetAttributeCSSProperty(targetElement, attributeName))
     return true;
@@ skipping 374 matching lines @@
 DEFINE_TRACE(SVGAnimateElement) {
   visitor->trace(m_fromProperty);
   visitor->trace(m_toProperty);
   visitor->trace(m_toAtEndOfDurationProperty);
   visitor->trace(m_animatedValue);
   visitor->trace(m_targetProperty);
   SVGAnimationElement::trace(visitor);
 }
 
 }  // namespace blink