Index: Source/core/svg/SVGScriptElement.cpp |
diff --git a/Source/core/svg/SVGScriptElement.cpp b/Source/core/svg/SVGScriptElement.cpp |
index d7c68faba3e0a1eb29e6e655f2986ceb0e0e1579..d3f782b296425ec002ba046e4a06eac068f846dc 100644 |
--- a/Source/core/svg/SVGScriptElement.cpp |
+++ b/Source/core/svg/SVGScriptElement.cpp |
@@ -28,6 +28,7 @@ |
#include "core/dom/Attribute.h" |
#include "core/dom/Document.h" |
#include "core/dom/EventNames.h" |
+#include "core/dom/ScriptLoader.h" |
#include "core/svg/SVGElementInstance.h" |
#include "core/svg/properties/SVGAnimatedStaticPropertyTearOff.h" |
@@ -45,7 +46,7 @@ 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_scriptElement(ScriptElement::create(this, wasInsertedByParser, alreadyStarted)) |
+ , m_loader(ScriptLoader::create(this, wasInsertedByParser, alreadyStarted)) |
{ |
ASSERT(hasTagName(SVGNames::scriptTag)); |
ScriptWrappable::init(this); |
@@ -107,7 +108,7 @@ void SVGScriptElement::svgAttributeChanged(const QualifiedName& attrName) |
return; |
if (SVGURIReference::isKnownAttribute(attrName)) { |
- m_scriptElement->handleSourceAttribute(href()); |
+ m_loader->handleSourceAttribute(href()); |
return; |
} |
@@ -120,7 +121,7 @@ void SVGScriptElement::svgAttributeChanged(const QualifiedName& attrName) |
Node::InsertionNotificationRequest SVGScriptElement::insertedInto(ContainerNode* rootParent) |
{ |
SVGElement::insertedInto(rootParent); |
- m_scriptElement->insertedInto(rootParent); |
+ m_loader->insertedInto(rootParent); |
if (rootParent->inDocument()) |
SVGExternalResourcesRequired::insertedIntoDocument(this); |
return InsertionDone; |
@@ -129,7 +130,7 @@ Node::InsertionNotificationRequest SVGScriptElement::insertedInto(ContainerNode* |
void SVGScriptElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta) |
{ |
SVGElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta); |
- m_scriptElement->childrenChanged(); |
+ m_loader->childrenChanged(); |
} |
bool SVGScriptElement::isURLAttribute(const Attribute& attribute) const |
@@ -207,22 +208,22 @@ bool SVGScriptElement::hasSourceAttribute() const |
PassRefPtr<Element> SVGScriptElement::cloneElementWithoutAttributesAndChildren() |
{ |
- return adoptRef(new SVGScriptElement(tagQName(), document(), false, m_scriptElement->alreadyStarted())); |
+ return adoptRef(new SVGScriptElement(tagQName(), document(), false, m_loader->alreadyStarted())); |
} |
void SVGScriptElement::setHaveFiredLoadEvent(bool haveFiredLoadEvent) |
{ |
- m_scriptElement->setHaveFiredLoadEvent(haveFiredLoadEvent); |
+ m_loader->setHaveFiredLoadEvent(haveFiredLoadEvent); |
} |
bool SVGScriptElement::isParserInserted() const |
{ |
- return m_scriptElement->isParserInserted(); |
+ return m_loader->isParserInserted(); |
} |
bool SVGScriptElement::haveFiredLoadEvent() const |
{ |
- return m_scriptElement->haveFiredLoadEvent(); |
+ return m_loader->haveFiredLoadEvent(); |
} |
Timer<SVGElement>* SVGScriptElement::svgLoadEventTimer() |