diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/svg/SVGEllipseElement.h | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/svg/SVGEllipseElement.h')
| -rw-r--r-- | WebCore/svg/SVGEllipseElement.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/WebCore/svg/SVGEllipseElement.h b/WebCore/svg/SVGEllipseElement.h index 3bd7a50..7ba2085 100644 --- a/WebCore/svg/SVGEllipseElement.h +++ b/WebCore/svg/SVGEllipseElement.h @@ -22,8 +22,8 @@ #define SVGEllipseElement_h #if ENABLE(SVG) +#include "SVGAnimatedBoolean.h" #include "SVGAnimatedLength.h" -#include "SVGAnimatedPropertyMacros.h" #include "SVGExternalResourcesRequired.h" #include "SVGLangSpace.h" #include "SVGStyledTransformableElement.h" @@ -31,34 +31,35 @@ namespace WebCore { - class SVGEllipseElement : public SVGStyledTransformableElement, - public SVGTests, - public SVGLangSpace, - public SVGExternalResourcesRequired { - public: - static PassRefPtr<SVGEllipseElement> create(const QualifiedName&, Document*); +class SVGEllipseElement : public SVGStyledTransformableElement, + public SVGTests, + public SVGLangSpace, + public SVGExternalResourcesRequired { +public: + static PassRefPtr<SVGEllipseElement> create(const QualifiedName&, Document*); - private: - SVGEllipseElement(const QualifiedName&, Document*); - - virtual bool isValid() const { return SVGTests::isValid(); } +private: + SVGEllipseElement(const QualifiedName&, Document*); + + virtual bool isValid() const { return SVGTests::isValid(); } - virtual void parseMappedAttribute(Attribute*); - virtual void svgAttributeChanged(const QualifiedName&); - virtual void synchronizeProperty(const QualifiedName&); + virtual void parseMappedAttribute(Attribute*); + virtual void svgAttributeChanged(const QualifiedName&); + virtual void synchronizeProperty(const QualifiedName&); - virtual void toPathData(Path&) const; + virtual void toPathData(Path&) const; - virtual bool selfHasRelativeLengths() const; + virtual bool selfHasRelativeLengths() const; - DECLARE_ANIMATED_PROPERTY_NEW(SVGEllipseElement, SVGNames::cxAttr, SVGLength, Cx, cx) - DECLARE_ANIMATED_PROPERTY_NEW(SVGEllipseElement, SVGNames::cyAttr, SVGLength, Cy, cy) - DECLARE_ANIMATED_PROPERTY_NEW(SVGEllipseElement, SVGNames::rxAttr, SVGLength, Rx, rx) - DECLARE_ANIMATED_PROPERTY_NEW(SVGEllipseElement, SVGNames::ryAttr, SVGLength, Ry, ry) + // Animated property declarations + DECLARE_ANIMATED_LENGTH(Cx, cx) + DECLARE_ANIMATED_LENGTH(Cy, cy) + DECLARE_ANIMATED_LENGTH(Rx, rx) + DECLARE_ANIMATED_LENGTH(Ry, ry) - // SVGExternalResourcesRequired - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGEllipseElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired) - }; + // SVGExternalResourcesRequired + DECLARE_ANIMATED_BOOLEAN(ExternalResourcesRequired, externalResourcesRequired) +}; } // namespace WebCore |