Index: Source/core/svg/SVGScriptElement.h |
diff --git a/Source/core/svg/SVGScriptElement.h b/Source/core/svg/SVGScriptElement.h |
index 544838b209a4445402a09c3aa192fede9b963847..95982192eaa9697928f78e2b60cd90cc9648872c 100644 |
--- a/Source/core/svg/SVGScriptElement.h |
+++ b/Source/core/svg/SVGScriptElement.h |
@@ -26,7 +26,6 @@ |
#include "core/svg/SVGAnimatedBoolean.h" |
#include "core/svg/SVGAnimatedString.h" |
#include "core/svg/SVGElement.h" |
-#include "core/svg/SVGExternalResourcesRequired.h" |
#include "core/svg/SVGURIReference.h" |
namespace WebCore { |
@@ -36,7 +35,6 @@ class ScriptLoader; |
class SVGScriptElement FINAL |
: public SVGElement |
, public SVGURIReference |
- , public SVGExternalResourcesRequired |
, public ScriptLoaderClient { |
public: |
static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document&, bool wasInsertedByParser); |
@@ -61,7 +59,7 @@ private: |
virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const; |
- virtual bool haveLoadedRequiredResources() { return SVGExternalResourcesRequired::haveLoadedRequiredResources(); } |
+ virtual bool haveLoadedRequiredResources(); |
virtual String sourceAttributeValue() const; |
virtual String charsetAttributeValue() const; |
@@ -73,20 +71,15 @@ private: |
virtual bool deferAttributeValue() const; |
virtual bool hasSourceAttribute() const; |
- virtual void dispatchLoadEvent() { SVGExternalResourcesRequired::dispatchLoadEvent(this); } |
+ virtual void dispatchLoadEvent(); |
virtual PassRefPtr<Element> cloneElementWithoutAttributesAndChildren(); |
virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE { return false; } |
- // SVGExternalResourcesRequired |
- virtual void setHaveFiredLoadEvent(bool) OVERRIDE; |
- virtual bool isParserInserted() const OVERRIDE; |
- virtual bool haveFiredLoadEvent() const OVERRIDE; |
- virtual Timer<SVGElement>* svgLoadEventTimer() OVERRIDE; |
+ virtual Timer<SVGElement>* svgLoadEventTimer() OVERRIDE { return &m_svgLoadEventTimer; } |
BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGScriptElement) |
DECLARE_ANIMATED_STRING(Href, href) |
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired) |
END_DECLARE_ANIMATED_PROPERTIES |
String m_type; |