Add support for 'href' (w/o XLink NS) for various SVG elements

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

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 221 matching lines @@
 {
     clearResourceAndEventBaseReferences();
 
     if (!inDocument()) {
         // Reset the target element if we are no longer in the document.
         setTargetElement(nullptr);
         return;
     }
 
     AtomicString id;
-    AtomicString href = getAttribute(XLinkNames::hrefAttr);
+    AtomicString href = getAttribute(SVGNames::hrefAttr);

[pdr., 2016/02/09 23:17:07]

Can we use Element::hrefURL here?

[fs, 2016/02/10 14:44:46]

We probably could (considering SVGSMILElements are never layouted etc.) - I
don't think it would be without peril though. And then there's the issue of
String vs. KURL (which hrefURL returns), so there'd need to be some impedance
matching here. I'd be happy to try and clean this up in a follow-up though
(never really been a fan of the somewhat ad-hoc looking code in
SVGURIReference.)

[fs, 2016/02/11 13:35:12]

I did an attempt at "hiding" the details a bit. Not a huge success IMHO. See
latest PS.

+    if (href.isNull())
+        href = getAttribute(XLinkNames::hrefAttr);
     Element* target;
     if (href.isEmpty())
         target = parentNode() && parentNode()->isElementNode() ? toElement(parentNode()) : nullptr;
     else
         target = SVGURIReference::targetElementFromIRIString(href, treeScope(), &id);
     SVGElement* svgTarget = target && target->isSVGElement() ? toSVGElement(target) : nullptr;
 
     if (svgTarget && !svgTarget->inDocument())
         svgTarget = nullptr;
 
@@ skipping 27 matching lines @@
 
     AtomicString prefix;
     AtomicString localName;
     if (!Document::parseQualifiedName(attributeName, prefix, localName, IGNORE_EXCEPTION))
         return anyQName();
 
     const AtomicString& namespaceURI = svgElement->lookupNamespaceURI(prefix);
     if (namespaceURI.isEmpty())
         return anyQName();
 
-    return QualifiedName(nullAtom, localName, namespaceURI);
+    QualifiedName resolvedAttrName(nullAtom, localName, namespaceURI);
+    // 'xlink:href' should map to 'href' for animation purposes. (It's possible that I just dreamt this.)
+    if (resolvedAttrName == XLinkNames::hrefAttr)
+        return SVGNames::hrefAttr;
+    return resolvedAttrName;
 }
 
 static inline void clearTimesWithDynamicOrigins(Vector<SMILTimeWithOrigin>& timeList)
 {
     for (int i = timeList.size() - 1; i >= 0; --i) {
         if (timeList[i].originIsScript())
             timeList.remove(i);
     }
 }
 
@@ skipping 236 matching lines @@
         setAttributeEventListener(EventTypeNames::endEvent, createAttributeEventListener(this, name, value, eventParameterName()));
     } else if (name == SVGNames::onrepeatAttr) {
         setAttributeEventListener(EventTypeNames::repeatEvent, createAttributeEventListener(this, name, value, eventParameterName()));
     } else {
         SVGElement::parseAttribute(name, oldValue, value);
     }
 }
 
 void SVGSMILElement::svgAttributeChanged(const QualifiedName& attrName)
 {
-    if (attrName == SVGNames::durAttr)
+    if (attrName == SVGNames::durAttr) {
         m_cachedDur = invalidCachedTime;
-    else if (attrName == SVGNames::repeatDurAttr)
+    } else if (attrName == SVGNames::repeatDurAttr) {
         m_cachedRepeatDur = invalidCachedTime;
-    else if (attrName == SVGNames::repeatCountAttr)
+    } else if (attrName == SVGNames::repeatCountAttr) {
         m_cachedRepeatCount = invalidCachedTime;
-    else if (attrName == SVGNames::minAttr)
+    } else if (attrName == SVGNames::minAttr) {
         m_cachedMin = invalidCachedTime;
-    else if (attrName == SVGNames::maxAttr)
+    } else if (attrName == SVGNames::maxAttr) {
         m_cachedMax = invalidCachedTime;
-    else if (attrName == SVGNames::attributeNameAttr)
+    } else if (attrName == SVGNames::attributeNameAttr) {
         setAttributeName(constructQualifiedName(this, fastGetAttribute(SVGNames::attributeNameAttr)));
-    else if (attrName.matches(XLinkNames::hrefAttr)) {
+    } else if (attrName.matches(SVGNames::hrefAttr) || attrName.matches(XLinkNames::hrefAttr)) {
+        // TODO(fs): Could be smarter here when 'href' is specified and 'xlink:href' is changed.
         SVGElement::InvalidationGuard invalidationGuard(this);
         buildPendingResource();
         if (m_targetElement)
             clearAnimatedType();
     } else if (attrName == SVGNames::beginAttr || attrName == SVGNames::endAttr) {
         if (inDocument()) {
             connectEventBaseConditions();
             if (attrName == SVGNames::beginAttr)
                 beginListChanged(elapsed());
             else if (attrName == SVGNames::endAttr)
@@ skipping 791 matching lines @@
     visitor->trace(m_targetElement);
     visitor->trace(m_timeContainer);
     visitor->trace(m_conditions);
     visitor->trace(m_syncBaseDependents);
 #endif
     SVGElement::trace(visitor);
     SVGTests::trace(visitor);
 }
 
 } // namespace blink