Remove support for the externalResourcesRequired attribute.

Source/core/svg/SVGScriptElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007 Rob Buis <buis@kde.org>
  *
  * 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.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 18 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/ScriptLoader.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/svg/SVGElementInstance.h"
 #include "core/svg/properties/SVGAnimatedStaticPropertyTearOff.h"
 
 namespace WebCore {
 
 // Animated property definitions
 DEFINE_ANIMATED_STRING(SVGScriptElement, XLinkNames::hrefAttr, Href, href)
-DEFINE_ANIMATED_BOOLEAN(SVGScriptElement, SVGNames::externalResourcesRequiredAttr, ExternalResourcesRequired, externalResourcesRequired)
 
 BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGScriptElement)
     REGISTER_LOCAL_ANIMATED_PROPERTY(href)
-    REGISTER_LOCAL_ANIMATED_PROPERTY(externalResourcesRequired)
 END_REGISTER_ANIMATED_PROPERTIES
 
 inline SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document& document, bool wasInsertedByParser, bool alreadyStarted)
     : SVGElement(tagName, document)
     , m_svgLoadEventTimer(this, &SVGElement::svgLoadEventTimerFired)
     , m_loader(ScriptLoader::create(this, wasInsertedByParser, alreadyStarted))
 {
     ASSERT(hasTagName(SVGNames::scriptTag));
     ScriptWrappable::init(this);
     registerAnimatedPropertiesForSVGScriptElement();
 }
 
 PassRefPtr<SVGScriptElement> SVGScriptElement::create(const QualifiedName& tagName, Document& document, bool insertedByParser)
 {
     return adoptRef(new SVGScriptElement(tagName, document, insertedByParser, false));
 }
 
 bool SVGScriptElement::isSupportedAttribute(const QualifiedName& attrName)
 {
     DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, supportedAttributes, ());
     if (supportedAttributes.isEmpty()) {
         SVGURIReference::addSupportedAttributes(supportedAttributes);
-        SVGExternalResourcesRequired::addSupportedAttributes(supportedAttributes);
         supportedAttributes.add(SVGNames::typeAttr);
         supportedAttributes.add(HTMLNames::onerrorAttr);
     }
     return supportedAttributes.contains<SVGAttributeHashTranslator>(attrName);
 }
 
 void SVGScriptElement::parseAttribute(const QualifiedName& name, const AtomicString& value)
 {
     if (!isSupportedAttribute(name)) {
         SVGElement::parseAttribute(name, value);
         return;
     }
 
     if (name == SVGNames::typeAttr) {
         setType(value);
         return;
     }
 
     if (name == HTMLNames::onerrorAttr) {
         setAttributeEventListener(EventTypeNames::error, createAttributeEventListener(this, name, value));
         return;
     }
 
     if (SVGURIReference::parseAttribute(name, value))
         return;
-    if (SVGExternalResourcesRequired::parseAttribute(name, value))
-        return;
 
     ASSERT_NOT_REACHED();
 }
 
 void SVGScriptElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     if (!isSupportedAttribute(attrName)) {
         SVGElement::svgAttributeChanged(attrName);
         return;
     }
 
     SVGElementInstance::InvalidationGuard invalidationGuard(this);
 
     if (attrName == SVGNames::typeAttr || attrName == HTMLNames::onerrorAttr)
         return;
 
     if (SVGURIReference::isKnownAttribute(attrName)) {
         m_loader->handleSourceAttribute(hrefCurrentValue());
         return;
     }
 
-    if (SVGExternalResourcesRequired::handleAttributeChange(this, attrName))
-        return;
-
     ASSERT_NOT_REACHED();
 }
 
 Node::InsertionNotificationRequest SVGScriptElement::insertedInto(ContainerNode* rootParent)
 {
     SVGElement::insertedInto(rootParent);
     return InsertionShouldCallDidNotifySubtreeInsertions;
 }
 
 void SVGScriptElement::didNotifySubtreeInsertionsToDocument()
 {
     m_loader->didNotifySubtreeInsertionsToDocument();
-    SVGExternalResourcesRequired::insertedIntoDocument(this);
+
+    if (!m_loader->isParserInserted()) {
+        m_loader->setHaveFiredLoadEvent(true);
+        sendSVGLoadEventIfPossibleAsynchronously();
+    }
 }
 
 void SVGScriptElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
 {
     SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
     m_loader->childrenChanged();
 }
 
 bool SVGScriptElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name() == sourceAttributeValue();
 }
 
 void SVGScriptElement::finishParsingChildren()
 {
     SVGElement::finishParsingChildren();
-    SVGExternalResourcesRequired::finishParsingChildren();
+    m_loader->setHaveFiredLoadEvent(true);
 }
 
 String SVGScriptElement::type() const
 {
     return m_type;
 }
 
 void SVGScriptElement::setType(const String& type)
 {
     m_type = type;
 }
 
 void SVGScriptElement::addSubresourceAttributeURLs(ListHashSet<KURL>& urls) const
 {
     SVGElement::addSubresourceAttributeURLs(urls);
 
     addSubresourceURL(urls, document().completeURL(hrefCurrentValue()));
 }
 
+bool SVGScriptElement::haveLoadedRequiredResources()
+{
+    return m_loader->haveFiredLoadEvent();
+}
+
 String SVGScriptElement::sourceAttributeValue() const
 {
     return hrefCurrentValue();
 }
 
 String SVGScriptElement::charsetAttributeValue() const
 {
     return String();
 }
 
@@ skipping 30 matching lines @@
 bool SVGScriptElement::hasSourceAttribute() const
 {
     return hasAttribute(XLinkNames::hrefAttr);
 }
 
 PassRefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren()
 {
     return adoptRef(new SVGScriptElement(tagQName(), document(), false, m_loader->alreadyStarted()));
 }
 
-void SVGScriptElement::setHaveFiredLoadEvent(bool haveFiredLoadEvent)
+void SVGScriptElement::dispatchLoadEvent()

[Stephen Chennney, 2013/11/06 16:45:43]

This effectively does nothing except assert. What should be happening here, if
anything?

[Erik Dahlström (inactive), 2013/11/07 09:38:04]

I've copied the code from SVGExternalResourcesRequired::dispatchLoadEvent to
here (it was called in the header file), and removed dead code from assuming
eRR=false. This is the result of that.

What I'd really like for it to do is dispatch load here, possibly triggering
load on the parent outermost <svg> element.

 {
-    m_loader->setHaveFiredLoadEvent(haveFiredLoadEvent);
-}
-
-bool SVGScriptElement::isParserInserted() const
-{
-    return m_loader->isParserInserted();
-}
-
-bool SVGScriptElement::haveFiredLoadEvent() const
-{
-    return m_loader->haveFiredLoadEvent();
-}
-
-Timer<SVGElement>* SVGScriptElement::svgLoadEventTimer()
-{
-    return &m_svgLoadEventTimer;
+    if (!m_loader->isParserInserted())
+        ASSERT(m_loader->haveFiredLoadEvent());
+    else if (m_loader->haveFiredLoadEvent())
+        return;
 }
 
 }