commit 09380295ba73501a205346becac22c6978e4671d
author Torne (Richard Coles) <torne@google.com> Fri Feb 21 12:17:33 2014 +0000
committer Torne (Richard Coles) <torne@google.com> Fri Feb 21 12:17:33 2014 +0000
tree bf350df1320896ac8d4646f4e62473422d27376d
parent 5724c7df915eb741361b685fc719dd5643e4cc0b

Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c

Source/core/svg/SVGMPathElement.h

diff --git a/Source/core/svg/SVGMPathElement.h b/Source/core/svg/SVGMPathElement.h
index 0bccf80..3799d83 100644
--- a/Source/core/svg/SVGMPathElement.h
+++ b/Source/core/svg/SVGMPathElement.h
@@ -24,7 +24,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 {
@@ -32,8 +31,7 @@
 class SVGPathElement;
 
 class SVGMPathElement FINAL : public SVGElement,
-                              public SVGURIReference,
-                              public SVGExternalResourcesRequired {
+                              public SVGURIReference {
 public:
     static PassRefPtr<SVGMPathElement> create(Document&);
 
@@ -46,10 +44,10 @@
 private:
     explicit SVGMPathElement(Document&);
 
-    void buildPendingResource();
+    virtual void buildPendingResource() OVERRIDE;
     void clearResourceReferences();
     virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
-    void removedFrom(ContainerNode*);
+    virtual void removedFrom(ContainerNode*) OVERRIDE;
 
     bool isSupportedAttribute(const QualifiedName&);
     virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
@@ -59,8 +57,6 @@
     void notifyParentOfPathChange(ContainerNode*);
 
     BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGMPathElement)
-        DECLARE_ANIMATED_STRING(Href, href)
-        DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired)
     END_DECLARE_ANIMATED_PROPERTIES
 };