Push hasValidAttributeName/Type down into SVGAnimateElement

third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp

Index: third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
index 1e2dfff24dde60de9bf803331d50278355f4eac6..02dc37c732ecf236cf0a86aceb9bb4cb9b7119d3 100644
--- a/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SVGSMILElement.cpp
@@ -325,10 +325,6 @@ void SVGSMILElement::removedFrom(ContainerNode* rootParent) {
   SVGElement::removedFrom(rootParent);
 }
 
-bool SVGSMILElement::hasValidAttributeName() {
-  return attributeName() != anyQName();
-}
-
 SMILTime SVGSMILElement::parseOffsetValue(const String& data) {
   bool ok;
   double result = 0;
@@ -1322,11 +1318,14 @@ void SVGSMILElement::dispatchPendingEvent(const AtomicString& eventType) {
   }
 }
 
+bool SVGSMILElement::hasValidTarget() {
+  return targetElement() && targetElement()->inActiveDocument();
+}
+
 void SVGSMILElement::schedule() {
-  ASSERT(!m_isScheduled);
+  DCHECK(!m_isScheduled);
 
-  if (!m_timeContainer || !m_targetElement || !hasValidAttributeName() ||
-      !hasValidAttributeType() || !m_targetElement->inActiveDocument())
+  if (!m_timeContainer || !hasValidTarget())
     return;
 
   m_timeContainer->schedule(this, m_targetElement, m_attributeName);
@@ -1337,8 +1336,8 @@ void SVGSMILElement::unscheduleIfScheduled() {
   if (!m_isScheduled)
     return;
 
-  ASSERT(m_timeContainer);
-  ASSERT(m_targetElement);
+  DCHECK(m_timeContainer);
+  DCHECK(m_targetElement);
   m_timeContainer->unschedule(this, m_targetElement, m_attributeName);
   m_isScheduled = false;
 }