Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1046)

Unified Diff: Source/core/svg/SVGScriptElement.h

Issue 62083002: Remove support for the externalResourcesRequired attribute. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebaseline test Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/svg/SVGSVGElement.idl ('k') | Source/core/svg/SVGScriptElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGScriptElement.h
diff --git a/Source/core/svg/SVGScriptElement.h b/Source/core/svg/SVGScriptElement.h
index ed8eee698be271de173f1b76d3f2c981127722c2..b52ae9646cb9e640e538689b607959add1021214 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(Document&, bool wasInsertedByParser);
@@ -57,9 +55,10 @@ private:
virtual void svgAttributeChanged(const QualifiedName&);
virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
+ virtual bool isStructurallyExternal() const { return hasSourceAttribute(); }
virtual void finishParsingChildren();
- virtual bool haveLoadedRequiredResources() { return SVGExternalResourcesRequired::haveLoadedRequiredResources(); }
+ virtual bool haveLoadedRequiredResources() OVERRIDE;
virtual String sourceAttributeValue() const;
virtual String charsetAttributeValue() const;
@@ -71,20 +70,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;
« no previous file with comments | « Source/core/svg/SVGSVGElement.idl ('k') | Source/core/svg/SVGScriptElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698