Index: Source/core/svg/SVGUseElement.h |
diff --git a/Source/core/svg/SVGUseElement.h b/Source/core/svg/SVGUseElement.h |
index 3cc6b6bb7ec531400b2c16c98be2f3e1a9d4968f..2b07427aa362f78e01fe25a06292058104bf3148 100644 |
--- a/Source/core/svg/SVGUseElement.h |
+++ b/Source/core/svg/SVGUseElement.h |
@@ -25,7 +25,6 @@ |
#include "core/fetch/DocumentResource.h" |
#include "core/svg/SVGAnimatedBoolean.h" |
#include "core/svg/SVGAnimatedLength.h" |
-#include "core/svg/SVGExternalResourcesRequired.h" |
#include "core/svg/SVGGraphicsElement.h" |
#include "core/svg/SVGURIReference.h" |
@@ -35,7 +34,6 @@ class DocumentResource; |
class SVGElementInstance; |
class SVGUseElement FINAL : public SVGGraphicsElement, |
- public SVGExternalResourcesRequired, |
public SVGURIReference, |
public DocumentResourceClient { |
public: |
@@ -74,7 +72,7 @@ private: |
void buildShadowAndInstanceTree(SVGElement* target); |
void detachInstance(); |
- virtual bool haveLoadedRequiredResources() { return SVGExternalResourcesRequired::haveLoadedRequiredResources(); } |
+ virtual bool haveLoadedRequiredResources() { return m_haveFiredLoadEvent; } |
Stephen Chennney
2013/11/06 16:45:43
Ditto. In particular, if these are virtual, what v
Erik Dahlström (inactive)
2013/11/07 09:38:04
SVGElement::haveLoadedRequiredResources is virtual
|
virtual void finishParsingChildren(); |
virtual bool selfHasRelativeLengths() const; |
@@ -102,7 +100,6 @@ private: |
DECLARE_ANIMATED_LENGTH(Width, width) |
DECLARE_ANIMATED_LENGTH(Height, height) |
DECLARE_ANIMATED_STRING(Href, href) |
- DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired) |
END_DECLARE_ANIMATED_PROPERTIES |
bool resourceIsStillLoading(); |
@@ -112,10 +109,6 @@ private: |
Document* referencedDocument() const; |
void setDocumentResource(ResourcePtr<DocumentResource>); |
- // SVGExternalResourcesRequired |
- virtual void setHaveFiredLoadEvent(bool haveFiredLoadEvent) { m_haveFiredLoadEvent = haveFiredLoadEvent; } |
- virtual bool isParserInserted() const { return m_wasInsertedByParser; } |
- virtual bool haveFiredLoadEvent() const { return m_haveFiredLoadEvent; } |
virtual Timer<SVGElement>* svgLoadEventTimer() OVERRIDE { return &m_svgLoadEventTimer; } |
bool m_wasInsertedByParser; |