Changeset 73130 in webkit


Ignore:
Timestamp:
Dec 2, 2010 7:19:03 AM (13 years ago)
Author:
Nikolas Zimmermann
Message:

2010-12-02 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Adam Roben.

Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGAnimatedString/SVGAnimatedEnumeration
​https://bugs.webkit.org/show_bug.cgi?id=50383

Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_(STRING|ENUMERATION) / DEFINE_ANIMATED_(STRING|ENUMERATION).
The animated property declaration lives in the header, the definition in the cpp file, to avoid the dependency on SVGNames.h in all headers.

No functional changes, thus no new tests.

  • svg/SVGAElement.cpp:
  • svg/SVGAElement.h: (WebCore::SVGAElement::isValid): (WebCore::SVGAElement::target):
  • svg/SVGAltGlyphElement.cpp:
  • svg/SVGAltGlyphElement.h:
  • svg/SVGAnimatedEnumeration.h:
  • svg/SVGAnimatedString.h:
  • svg/SVGClipPathElement.cpp:
  • svg/SVGClipPathElement.h:
  • svg/SVGComponentTransferFunctionElement.cpp:
  • svg/SVGComponentTransferFunctionElement.h:
  • svg/SVGCursorElement.cpp:
  • svg/SVGCursorElement.h:
  • svg/SVGFEBlendElement.cpp:
  • svg/SVGFEBlendElement.h:
  • svg/SVGFEColorMatrixElement.cpp:
  • svg/SVGFEColorMatrixElement.h:
  • svg/SVGFEComponentTransferElement.cpp:
  • svg/SVGFEComponentTransferElement.h:
  • svg/SVGFECompositeElement.cpp:
  • svg/SVGFECompositeElement.h:
  • svg/SVGFEConvolveMatrixElement.cpp:
  • svg/SVGFEConvolveMatrixElement.h:
  • svg/SVGFEDiffuseLightingElement.cpp:
  • svg/SVGFEDiffuseLightingElement.h:
  • svg/SVGFEDisplacementMapElement.cpp:
  • svg/SVGFEDisplacementMapElement.h:
  • svg/SVGFEGaussianBlurElement.cpp:
  • svg/SVGFEGaussianBlurElement.h:
  • svg/SVGFEImageElement.cpp:
  • svg/SVGFEImageElement.h:
  • svg/SVGFELightElement.cpp:
  • svg/SVGFEMergeNodeElement.cpp:
  • svg/SVGFEMergeNodeElement.h:
  • svg/SVGFEMorphologyElement.cpp:
  • svg/SVGFEMorphologyElement.h:
  • svg/SVGFEOffsetElement.cpp:
  • svg/SVGFEOffsetElement.h:
  • svg/SVGFESpecularLightingElement.cpp:
  • svg/SVGFESpecularLightingElement.h:
  • svg/SVGFETileElement.cpp:
  • svg/SVGFETileElement.h:
  • svg/SVGFETurbulenceElement.cpp:
  • svg/SVGFETurbulenceElement.h:
  • svg/SVGFilterElement.cpp:
  • svg/SVGFilterElement.h:
  • svg/SVGFilterPrimitiveStandardAttributes.cpp:
  • svg/SVGFilterPrimitiveStandardAttributes.h:
  • svg/SVGForeignObjectElement.cpp:
  • svg/SVGForeignObjectElement.h:
  • svg/SVGGradientElement.cpp:
  • svg/SVGGradientElement.h:
  • svg/SVGImageElement.cpp:
  • svg/SVGImageElement.h:
  • svg/SVGMPathElement.cpp:
  • svg/SVGMPathElement.h:
  • svg/SVGMarkerElement.cpp:
  • svg/SVGMarkerElement.h:
  • svg/SVGMaskElement.cpp:
  • svg/SVGMaskElement.h:
  • svg/SVGPatternElement.cpp:
  • svg/SVGPatternElement.h:
  • svg/SVGScriptElement.cpp:
  • svg/SVGScriptElement.h:
  • svg/SVGStyledElement.cpp:
  • svg/SVGStyledElement.h: (WebCore::SVGStyledElement::hasRelativeLengths): (WebCore::SVGStyledElement::supportsMarkers): (WebCore::SVGStyledElement::style): (WebCore::SVGStyledElement::updateRelativeLengthsInformation): (WebCore::SVGStyledElement::selfHasRelativeLengths): (WebCore::SVGStyledElement::isStyled):
  • svg/SVGTRefElement.cpp:
  • svg/SVGTRefElement.h:
  • svg/SVGTextContentElement.cpp:
  • svg/SVGTextContentElement.h:
  • svg/SVGTextPathElement.cpp:
  • svg/SVGTextPathElement.h:
  • svg/SVGUseElement.cpp:
  • svg/SVGUseElement.h:
Location:
trunk/WebCore
Files:
74 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r73129 r73130  
     12010-12-02  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Adam Roben.
     4
     5        Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGAnimatedString/SVGAnimatedEnumeration
     6        https://bugs.webkit.org/show_bug.cgi?id=50383
     7
     8        Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_(STRING|ENUMERATION) / DEFINE_ANIMATED_(STRING|ENUMERATION).
     9        The animated property declaration lives in the header, the definition in the cpp file, to avoid the dependency on SVGNames.h in all headers.
     10
     11        No functional changes, thus no new tests.
     12
     13        * svg/SVGAElement.cpp:
     14        * svg/SVGAElement.h:
     15        (WebCore::SVGAElement::isValid):
     16        (WebCore::SVGAElement::target):
     17        * svg/SVGAltGlyphElement.cpp:
     18        * svg/SVGAltGlyphElement.h:
     19        * svg/SVGAnimatedEnumeration.h:
     20        * svg/SVGAnimatedString.h:
     21        * svg/SVGClipPathElement.cpp:
     22        * svg/SVGClipPathElement.h:
     23        * svg/SVGComponentTransferFunctionElement.cpp:
     24        * svg/SVGComponentTransferFunctionElement.h:
     25        * svg/SVGCursorElement.cpp:
     26        * svg/SVGCursorElement.h:
     27        * svg/SVGFEBlendElement.cpp:
     28        * svg/SVGFEBlendElement.h:
     29        * svg/SVGFEColorMatrixElement.cpp:
     30        * svg/SVGFEColorMatrixElement.h:
     31        * svg/SVGFEComponentTransferElement.cpp:
     32        * svg/SVGFEComponentTransferElement.h:
     33        * svg/SVGFECompositeElement.cpp:
     34        * svg/SVGFECompositeElement.h:
     35        * svg/SVGFEConvolveMatrixElement.cpp:
     36        * svg/SVGFEConvolveMatrixElement.h:
     37        * svg/SVGFEDiffuseLightingElement.cpp:
     38        * svg/SVGFEDiffuseLightingElement.h:
     39        * svg/SVGFEDisplacementMapElement.cpp:
     40        * svg/SVGFEDisplacementMapElement.h:
     41        * svg/SVGFEGaussianBlurElement.cpp:
     42        * svg/SVGFEGaussianBlurElement.h:
     43        * svg/SVGFEImageElement.cpp:
     44        * svg/SVGFEImageElement.h:
     45        * svg/SVGFELightElement.cpp:
     46        * svg/SVGFEMergeNodeElement.cpp:
     47        * svg/SVGFEMergeNodeElement.h:
     48        * svg/SVGFEMorphologyElement.cpp:
     49        * svg/SVGFEMorphologyElement.h:
     50        * svg/SVGFEOffsetElement.cpp:
     51        * svg/SVGFEOffsetElement.h:
     52        * svg/SVGFESpecularLightingElement.cpp:
     53        * svg/SVGFESpecularLightingElement.h:
     54        * svg/SVGFETileElement.cpp:
     55        * svg/SVGFETileElement.h:
     56        * svg/SVGFETurbulenceElement.cpp:
     57        * svg/SVGFETurbulenceElement.h:
     58        * svg/SVGFilterElement.cpp:
     59        * svg/SVGFilterElement.h:
     60        * svg/SVGFilterPrimitiveStandardAttributes.cpp:
     61        * svg/SVGFilterPrimitiveStandardAttributes.h:
     62        * svg/SVGForeignObjectElement.cpp:
     63        * svg/SVGForeignObjectElement.h:
     64        * svg/SVGGradientElement.cpp:
     65        * svg/SVGGradientElement.h:
     66        * svg/SVGImageElement.cpp:
     67        * svg/SVGImageElement.h:
     68        * svg/SVGMPathElement.cpp:
     69        * svg/SVGMPathElement.h:
     70        * svg/SVGMarkerElement.cpp:
     71        * svg/SVGMarkerElement.h:
     72        * svg/SVGMaskElement.cpp:
     73        * svg/SVGMaskElement.h:
     74        * svg/SVGPatternElement.cpp:
     75        * svg/SVGPatternElement.h:
     76        * svg/SVGScriptElement.cpp:
     77        * svg/SVGScriptElement.h:
     78        * svg/SVGStyledElement.cpp:
     79        * svg/SVGStyledElement.h:
     80        (WebCore::SVGStyledElement::hasRelativeLengths):
     81        (WebCore::SVGStyledElement::supportsMarkers):
     82        (WebCore::SVGStyledElement::style):
     83        (WebCore::SVGStyledElement::updateRelativeLengthsInformation):
     84        (WebCore::SVGStyledElement::selfHasRelativeLengths):
     85        (WebCore::SVGStyledElement::isStyled):
     86        * svg/SVGTRefElement.cpp:
     87        * svg/SVGTRefElement.h:
     88        * svg/SVGTextContentElement.cpp:
     89        * svg/SVGTextContentElement.h:
     90        * svg/SVGTextPathElement.cpp:
     91        * svg/SVGTextPathElement.h:
     92        * svg/SVGUseElement.cpp:
     93        * svg/SVGUseElement.h:
     94
    1952010-12-02  Patrick Gansterer  <paroga@webkit.org>
    296

  • trunk/WebCore/svg/SVGAElement.cpp

    r72518 r73130  
    4848namespace WebCore {
    4949
     50// Animated property definitions
     51DEFINE_ANIMATED_STRING(SVGAElement, SVGNames::targetAttr, SVGTarget, svgTarget)
     52DEFINE_ANIMATED_STRING(SVGAElement, XLinkNames::hrefAttr, Href, href)
     53
    5054inline SVGAElement::SVGAElement(const QualifiedName& tagName, Document* document)
    5155    : SVGStyledTransformableElement(tagName, document)

  • trunk/WebCore/svg/SVGAElement.h

    r71227 r73130  
    2424
    2525#if ENABLE(SVG)
    26 #include "SVGAnimatedPropertyMacros.h"
    2726#include "SVGExternalResourcesRequired.h"
    2827#include "SVGLangSpace.h"
    … …  
    3332namespace WebCore {
    3433
    35     class SVGAElement : public SVGStyledTransformableElement,
    36                         public SVGURIReference,
    37                         public SVGTests,
    38                         public SVGLangSpace,
    39                         public SVGExternalResourcesRequired {
    40     public:
    41         static PassRefPtr<SVGAElement> create(const QualifiedName&, Document*);
     34class SVGAElement : public SVGStyledTransformableElement,
     35                    public SVGURIReference,
     36                    public SVGTests,
     37                    public SVGLangSpace,
     38                    public SVGExternalResourcesRequired {
     39public:
     40    static PassRefPtr<SVGAElement> create(const QualifiedName&, Document*);
    4241
    43     private:
    44         SVGAElement(const QualifiedName&, Document*);
     42private:
     43    SVGAElement(const QualifiedName&, Document*);
    4544
    46         virtual bool isValid() const { return SVGTests::isValid(); }
    47        
    48         virtual String title() const;
    49         virtual String target() const { return svgTarget(); }
     45    virtual bool isValid() const { return SVGTests::isValid(); }
     46   
     47    virtual String title() const;
     48    virtual String target() const { return svgTarget(); }
    5049
    51         virtual void parseMappedAttribute(Attribute*);
    52         virtual void svgAttributeChanged(const QualifiedName&);
    53         virtual void synchronizeProperty(const QualifiedName&);
     50    virtual void parseMappedAttribute(Attribute*);
     51    virtual void svgAttributeChanged(const QualifiedName&);
     52    virtual void synchronizeProperty(const QualifiedName&);
    5453
    55         virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     54    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    5655
    57         virtual void defaultEventHandler(Event*);
    58        
    59         virtual bool supportsFocus() const;
    60         virtual bool isMouseFocusable() const;
    61         virtual bool isKeyboardFocusable(KeyboardEvent*) const;
    62         virtual bool isFocusable() const;
     56    virtual void defaultEventHandler(Event*);
     57   
     58    virtual bool supportsFocus() const;
     59    virtual bool isMouseFocusable() const;
     60    virtual bool isKeyboardFocusable(KeyboardEvent*) const;
     61    virtual bool isFocusable() const;
    6362
    64         virtual bool childShouldCreateRenderer(Node*) const;
     63    virtual bool childShouldCreateRenderer(Node*) const;
    6564
    66         // This defines a non-virtual "String& target() const" method before, that would clash with "virtual String target() const"
    67         // in Element. That's why it's now named "String& svgTarget() const", to avoid the clash. The CodeGenerators take care
    68         // of calling svgTargetAnimated() instead of targetAnimated(), see CodeGenerator.pm.
    69         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGAElement, SVGNames::targetAttr, String, SVGTarget, svgTarget)
     65    // Animated property declarations
    7066
    71         // SVGURIReference
    72         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGAElement, XLinkNames::hrefAttr, String, Href, href)
     67    // This declaration used to define a non-virtual "String& target() const" method, that clashes with "virtual String Element::target() const".
     68    // That's why it has been renamed to "svgTarget", the CodeGenerators take care of calling svgTargetAnimated() instead of targetAnimated(), see CodeGenerator.pm.
     69    DECLARE_ANIMATED_STRING(SVGTarget, svgTarget)
    7370
    74         // SVGExternalResourcesRequired
    75         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGAElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
    76     };
     71    // SVGURIReference
     72    DECLARE_ANIMATED_STRING(Href, href)
     73
     74    // SVGExternalResourcesRequired
     75    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGAElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
     76};
    7777
    7878} // namespace WebCore
    7979
    8080#endif // ENABLE(SVG)
    81 
    8281#endif // SVGAElement_h

  • trunk/WebCore/svg/SVGAltGlyphElement.cpp

    r66498 r73130  
    3333
    3434namespace WebCore {
     35
     36// Animated property declarations
     37DEFINE_ANIMATED_STRING(SVGAltGlyphElement, XLinkNames::hrefAttr, Href, href)
    3538
    3639inline SVGAltGlyphElement::SVGAltGlyphElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGAltGlyphElement.h

    r71227 r73130  
    2626#include "SVGTextPositioningElement.h"
    2727#include "SVGURIReference.h"
    28 #include <wtf/text/AtomicString.h>
    2928
    3029namespace WebCore {
    3130
    32     class SVGGlyphElement;
     31class SVGGlyphElement;
    3332
    34     class SVGAltGlyphElement : public SVGTextPositioningElement,
    35                                public SVGURIReference {
    36     public:
    37         static PassRefPtr<SVGAltGlyphElement> create(const QualifiedName&, Document*);
     33class SVGAltGlyphElement : public SVGTextPositioningElement,
     34                           public SVGURIReference {
     35public:
     36    static PassRefPtr<SVGAltGlyphElement> create(const QualifiedName&, Document*);
    3837
    39         const AtomicString& glyphRef() const;
    40         void setGlyphRef(const AtomicString&, ExceptionCode&);
    41         const AtomicString& format() const;
    42         void setFormat(const AtomicString&, ExceptionCode&);
    43    
    44         SVGGlyphElement* glyphElement() const;
     38    const AtomicString& glyphRef() const;
     39    void setGlyphRef(const AtomicString&, ExceptionCode&);
     40    const AtomicString& format() const;
     41    void setFormat(const AtomicString&, ExceptionCode&);
    4542
    46     private:
    47         SVGAltGlyphElement(const QualifiedName&, Document*);
     43    SVGGlyphElement* glyphElement() const;
    4844
    49         virtual void synchronizeProperty(const QualifiedName&);
     45private:
     46    SVGAltGlyphElement(const QualifiedName&, Document*);
    5047
    51         virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    52         virtual bool childShouldCreateRenderer(Node*) const;
     48    virtual void synchronizeProperty(const QualifiedName&);
    5349
    54         // SVGURIReference
    55         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGAltGlyphElement, XLinkNames::hrefAttr, String, Href, href)
    56     };
     50    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     51    virtual bool childShouldCreateRenderer(Node*) const;
     52
     53    // Animated property declarations
     54
     55    // SVGURIReference
     56    DECLARE_ANIMATED_STRING(Href, href)
     57};
    5758
    5859} // namespace WebCore

  • trunk/WebCore/svg/SVGAnimatedEnumeration.h

    r70872 r73130  
    2222
    2323#if ENABLE(SVG)
     24#include "SVGAnimatedPropertyMacros.h"
    2425#include "SVGAnimatedStaticPropertyTearOff.h"
    2526
    … …  
    2829typedef SVGAnimatedStaticPropertyTearOff<int> SVGAnimatedEnumeration;
    2930
     31// Helper macros to declare/define a SVGAnimatedEnumeration object
     32#define DECLARE_ANIMATED_ENUMERATION(UpperProperty, LowerProperty) \
     33DECLARE_ANIMATED_PROPERTY(SVGAnimatedEnumeration, int, UpperProperty, LowerProperty)
     34
     35#define DEFINE_ANIMATED_ENUMERATION(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
     36DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, DOMAttribute.localName(), SVGAnimatedEnumeration, int, UpperProperty, LowerProperty)
     37
     38#define DEFINE_ANIMATED_ENUMERATION_MULTIPLE_WRAPPERS(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
     39DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, SVGAnimatedEnumeration, int, UpperProperty, LowerProperty)
     40
    3041} // namespace WebCore
    3142

  • trunk/WebCore/svg/SVGAnimatedString.h

    r71227 r73130  
    2222
    2323#if ENABLE(SVG)
     24#include "SVGAnimatedPropertyMacros.h"
    2425#include "SVGAnimatedStaticPropertyTearOff.h"
    25 #include <wtf/text/WTFString.h>
    2626
    2727namespace WebCore {
    … …  
    2929typedef SVGAnimatedStaticPropertyTearOff<String> SVGAnimatedString;
    3030
     31// Helper macros to declare/define a SVGAnimatedString object
     32#define DECLARE_ANIMATED_STRING(UpperProperty, LowerProperty) \
     33DECLARE_ANIMATED_PROPERTY(SVGAnimatedString, String, UpperProperty, LowerProperty)
     34
     35#define DEFINE_ANIMATED_STRING(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
     36DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, DOMAttribute.localName(), SVGAnimatedString, String, UpperProperty, LowerProperty)
     37
    3138} // namespace WebCore
    3239

  • trunk/WebCore/svg/SVGClipPathElement.cpp

    r72518 r73130  
    3434
    3535namespace WebCore {
     36
     37// Animated property definitions
     38DEFINE_ANIMATED_ENUMERATION(SVGClipPathElement, SVGNames::clipPathUnitsAttr, ClipPathUnits, clipPathUnits)
    3639
    3740inline SVGClipPathElement::SVGClipPathElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGClipPathElement.h

    r70872 r73130  
    2323
    2424#if ENABLE(SVG)
    25 #include "SVGAnimatedPropertyMacros.h"
     25#include "SVGAnimatedEnumeration.h"
    2626#include "SVGExternalResourcesRequired.h"
    2727#include "SVGLangSpace.h"
    … …  
    5353    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    5454
    55     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGClipPathElement, SVGNames::clipPathUnitsAttr, int, ClipPathUnits, clipPathUnits)
     55    // Animated property declarations
     56    DECLARE_ANIMATED_ENUMERATION(ClipPathUnits, clipPathUnits)
    5657
    5758    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGComponentTransferFunctionElement.cpp

    r73024 r73130  
    3232
    3333// Animated property definitions
     34DEFINE_ANIMATED_ENUMERATION(SVGComponentTransferFunctionElement, SVGNames::typeAttr, Type, type)
    3435DEFINE_ANIMATED_NUMBER_LIST(SVGComponentTransferFunctionElement, SVGNames::tableValuesAttr, TableValues, tableValues)
    3536DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::slopeAttr, Slope, slope)

  • trunk/WebCore/svg/SVGComponentTransferFunctionElement.h

    r73024 r73130  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEComponentTransfer.h"
     26#include "SVGAnimatedEnumeration.h"
    2627#include "SVGAnimatedNumber.h"
    2728#include "SVGAnimatedNumberList.h"
    … …  
    4142private:
    4243    // Animated property declarations
    43     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::typeAttr, int, Type, type)
     44    DECLARE_ANIMATED_ENUMERATION(Type, type)
    4445    DECLARE_ANIMATED_NUMBER_LIST(TableValues, tableValues)
    4546    DECLARE_ANIMATED_NUMBER(Slope, slope)

  • trunk/WebCore/svg/SVGCursorElement.cpp

    r73016 r73130  
    2626#include "Attr.h"
    2727#include "Document.h"
    28 #include "SVGLength.h"
    2928#include "SVGNames.h"
    3029
    … …  
    3433DEFINE_ANIMATED_LENGTH(SVGCursorElement, SVGNames::xAttr, X, x)
    3534DEFINE_ANIMATED_LENGTH(SVGCursorElement, SVGNames::yAttr, Y, y)
     35DEFINE_ANIMATED_STRING(SVGCursorElement, XLinkNames::hrefAttr, Href, href)
    3636
    3737inline SVGCursorElement::SVGCursorElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGCursorElement.h

    r73016 r73130  
    2424#if ENABLE(SVG)
    2525#include "SVGAnimatedLength.h"
    26 #include "SVGAnimatedPropertyMacros.h"
     26#include "SVGAnimatedString.h"
    2727#include "SVGElement.h"
    2828#include "SVGTests.h"
    … …  
    6060
    6161    // SVGURIReference
    62     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGCursorElement, XLinkNames::hrefAttr, String, Href, href)
     62    DECLARE_ANIMATED_STRING(Href, href)
    6363
    6464    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGFEBlendElement.cpp

    r72474 r73130  
    2727
    2828namespace WebCore {
     29
     30// Animated property definitions
     31DEFINE_ANIMATED_STRING(SVGFEBlendElement, SVGNames::inAttr, In1, in1)
     32DEFINE_ANIMATED_STRING(SVGFEBlendElement, SVGNames::in2Attr, In2, in2)
     33DEFINE_ANIMATED_ENUMERATION(SVGFEBlendElement, SVGNames::modeAttr, Mode, mode)
    2934
    3035inline SVGFEBlendElement::SVGFEBlendElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEBlendElement.h

    r72474 r73130  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEBlend.h"
     26#include "SVGAnimatedEnumeration.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    2728
    2829namespace WebCore {
     30
    2931class SVGFEBlendElement : public SVGFilterPrimitiveStandardAttributes {
    3032public:
    … …  
    3941    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    4042
    41     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEBlendElement, SVGNames::inAttr, String, In1, in1)
    42     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEBlendElement, SVGNames::in2Attr, String, In2, in2)
    43     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEBlendElement, SVGNames::modeAttr, int, Mode, mode)
     43    // Animated property declarations
     44    DECLARE_ANIMATED_STRING(In1, in1)
     45    DECLARE_ANIMATED_STRING(In2, in2)
     46    DECLARE_ANIMATED_ENUMERATION(Mode, mode)
    4447};
    4548
    … …  
    4851#endif // ENABLE(SVG)
    4952#endif
    50 
    51 // vim:ts=4:noet

  • trunk/WebCore/svg/SVGFEColorMatrixElement.cpp

    r73020 r73130  
    2626#include "Attribute.h"
    2727#include "SVGNames.h"
    28 #include "SVGNumberList.h"
    2928
    3029namespace WebCore {
    3130
    3231// Animated property definitions
     32DEFINE_ANIMATED_STRING(SVGFEColorMatrixElement, SVGNames::inAttr, In1, in1)
     33DEFINE_ANIMATED_ENUMERATION(SVGFEColorMatrixElement, SVGNames::typeAttr, Type, type)
    3334DEFINE_ANIMATED_NUMBER_LIST(SVGFEColorMatrixElement, SVGNames::valuesAttr, Values, values)
    3435

  • trunk/WebCore/svg/SVGFEColorMatrixElement.h

    r73020 r73130  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEColorMatrix.h"
     26#include "SVGAnimatedEnumeration.h"
    2627#include "SVGAnimatedNumberList.h"
    2728#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4243
    4344    // Animated property declarations
    44     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEColorMatrixElement, SVGNames::inAttr, String, In1, in1)
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEColorMatrixElement, SVGNames::typeAttr, int, Type, type)
     45    DECLARE_ANIMATED_STRING(In1, in1)
     46    DECLARE_ANIMATED_ENUMERATION(Type, type)
    4647    DECLARE_ANIMATED_NUMBER_LIST(Values, values)
    4748};

  • trunk/WebCore/svg/SVGFEComponentTransferElement.cpp

    r72474 r73130  
    3030#include "SVGFEFuncRElement.h"
    3131#include "SVGNames.h"
    32 #include "SVGRenderStyle.h"
    3332
    3433namespace WebCore {
     34
     35// Animated property declarations
     36DEFINE_ANIMATED_STRING(SVGFEComponentTransferElement, SVGNames::inAttr, In1, in1)
    3537
    3638inline SVGFEComponentTransferElement::SVGFEComponentTransferElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEComponentTransferElement.h

    r72474 r73130  
    2323
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
     25#include "FEComponentTransfer.h"
    2526#include "SVGFilterPrimitiveStandardAttributes.h"
    26 #include "FEComponentTransfer.h"
    2727
    2828namespace WebCore {
    … …  
    3939    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    4040
    41     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEComponentTransferElement, SVGNames::inAttr, String, In1, in1)
     41    // Animated property declarations
     42    DECLARE_ANIMATED_STRING(In1, in1)
    4243};
    4344

  • trunk/WebCore/svg/SVGFECompositeElement.cpp

    r73024 r73130  
    3030
    3131// Animated property definitions
     32DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::inAttr, In1, in1)
     33DEFINE_ANIMATED_STRING(SVGFECompositeElement, SVGNames::in2Attr, In2, in2)
     34DEFINE_ANIMATED_ENUMERATION(SVGFECompositeElement, SVGNames::operatorAttr, _operator, _operator)
    3235DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k1Attr, K1, k1)
    3336DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k2Attr, K2, k2)

  • trunk/WebCore/svg/SVGFECompositeElement.h

    r73024 r73130  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEComposite.h"
     26#include "SVGAnimatedEnumeration.h"
    2627#include "SVGAnimatedNumber.h"
    2728#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4243
    4344    // Animated property declarations
    44     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::inAttr, String, In1, in1)
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::in2Attr, String, In2, in2)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::operatorAttr, int, _operator, _operator)
     45    DECLARE_ANIMATED_STRING(In1, in1)
     46    DECLARE_ANIMATED_STRING(In2, in2)
     47    DECLARE_ANIMATED_ENUMERATION(_operator, _operator)
    4748    DECLARE_ANIMATED_NUMBER(K1, k1)
    4849    DECLARE_ANIMATED_NUMBER(K2, k2)

  • trunk/WebCore/svg/SVGFEConvolveMatrixElement.cpp

    r73024 r73130  
    3333
    3434// Animated property definitions
     35DEFINE_ANIMATED_STRING(SVGFEConvolveMatrixElement, SVGNames::inAttr, In1, in1)
    3536DEFINE_ANIMATED_NUMBER_LIST(SVGFEConvolveMatrixElement, SVGNames::kernelMatrixAttr, KernelMatrix, kernelMatrix)
    3637DEFINE_ANIMATED_NUMBER(SVGFEConvolveMatrixElement, SVGNames::divisorAttr, Divisor, divisor)
    3738DEFINE_ANIMATED_NUMBER(SVGFEConvolveMatrixElement, SVGNames::biasAttr, Bias, bias)
     39DEFINE_ANIMATED_ENUMERATION(SVGFEConvolveMatrixElement, SVGNames::operatorAttr, EdgeMode, edgeMode)
    3840DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), KernelUnitLengthX, kernelUnitLengthX)
    3941DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), KernelUnitLengthY, kernelUnitLengthY)

  • trunk/WebCore/svg/SVGFEConvolveMatrixElement.h

    r73024 r73130  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEConvolveMatrix.h"
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedNumber.h"
    2627#include "SVGAnimatedNumberList.h"
    … …  
    4950
    5051    // Animated property declarations
    51     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::inAttr, String, In1, in1)
     52    DECLARE_ANIMATED_STRING(In1, in1)
    5253    DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEConvolveMatrixElement, SVGNames::orderAttr, orderXIdentifier(), long, OrderX, orderX)
    5354    DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEConvolveMatrixElement, SVGNames::orderAttr, orderYIdentifier(), long, OrderY, orderY)
    … …  
    5758    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::targetXAttr, long, TargetX, targetX)
    5859    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::targetYAttr, long, TargetY, targetY)
    59     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::operatorAttr, int, EdgeMode, edgeMode)
     60    DECLARE_ANIMATED_ENUMERATION(EdgeMode, edgeMode)
    6061    DECLARE_ANIMATED_NUMBER(KernelUnitLengthX, kernelUnitLengthX)
    6162    DECLARE_ANIMATED_NUMBER(KernelUnitLengthY, kernelUnitLengthY)

  • trunk/WebCore/svg/SVGFEDiffuseLightingElement.cpp

    r73024 r73130  
    2525#include "Attr.h"
    2626#include "FEDiffuseLighting.h"
     27#include "RenderStyle.h"
    2728#include "SVGColor.h"
    2829#include "SVGFELightElement.h"
    2930#include "SVGNames.h"
    3031#include "SVGParserUtilities.h"
    31 #include "SVGRenderStyle.h"
    3232
    3333namespace WebCore {
    3434
    3535// Animated property definitions
     36DEFINE_ANIMATED_STRING(SVGFEDiffuseLightingElement, SVGNames::inAttr, In1, in1)
    3637DEFINE_ANIMATED_NUMBER(SVGFEDiffuseLightingElement, SVGNames::diffuseConstantAttr, DiffuseConstant, diffuseConstant)
    3738DEFINE_ANIMATED_NUMBER(SVGFEDiffuseLightingElement, SVGNames::surfaceScaleAttr, SurfaceScale, surfaceScale)

  • trunk/WebCore/svg/SVGFEDiffuseLightingElement.h

    r73024 r73130  
    4848
    4949    // Animated property declarations
    50     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDiffuseLightingElement, SVGNames::inAttr, String, In1, in1)
     50    DECLARE_ANIMATED_STRING(In1, in1)
    5151    DECLARE_ANIMATED_NUMBER(DiffuseConstant, diffuseConstant)
    5252    DECLARE_ANIMATED_NUMBER(SurfaceScale, surfaceScale)

  • trunk/WebCore/svg/SVGFEDisplacementMapElement.cpp

    r73024 r73130  
    2828
    2929// Animated property definitions
     30DEFINE_ANIMATED_STRING(SVGFEDisplacementMapElement, SVGNames::inAttr, In1, in1)
     31DEFINE_ANIMATED_STRING(SVGFEDisplacementMapElement, SVGNames::in2Attr, In2, in2)
     32DEFINE_ANIMATED_ENUMERATION(SVGFEDisplacementMapElement, SVGNames::xChannelSelectorAttr, XChannelSelector, xChannelSelector)
     33DEFINE_ANIMATED_ENUMERATION(SVGFEDisplacementMapElement, SVGNames::yChannelSelectorAttr, YChannelSelector, yChannelSelector)   
    3034DEFINE_ANIMATED_NUMBER(SVGFEDisplacementMapElement, SVGNames::scaleAttr, Scale, scale)
    3135

  • trunk/WebCore/svg/SVGFEDisplacementMapElement.h

    r73024 r73130  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEDisplacementMap.h"
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4344
    4445    // Animated property declarations
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::inAttr, String, In1, in1)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::in2Attr, String, In2, in2)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::xChannelSelectorAttr, int, XChannelSelector, xChannelSelector)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::yChannelSelectorAttr, int, YChannelSelector, yChannelSelector)
     46    DECLARE_ANIMATED_STRING(In1, in1)
     47    DECLARE_ANIMATED_STRING(In2, in2)
     48    DECLARE_ANIMATED_ENUMERATION(XChannelSelector, xChannelSelector)
     49    DECLARE_ANIMATED_ENUMERATION(YChannelSelector, yChannelSelector)
    4950    DECLARE_ANIMATED_NUMBER(Scale, scale)
    5051};

  • trunk/WebCore/svg/SVGFEGaussianBlurElement.cpp

    r73024 r73130  
    3131
    3232// Animated property definitions
     33DEFINE_ANIMATED_STRING(SVGFEGaussianBlurElement, SVGNames::inAttr, In1, in1)
    3334DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationXIdentifier(), StdDeviationX, stdDeviationX)
    3435DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationYIdentifier(), StdDeviationY, stdDeviationY)

  • trunk/WebCore/svg/SVGFEGaussianBlurElement.h

    r73024 r73130  
    4747
    4848    // Animated property declarations
    49     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEGaussianBlurElement, SVGNames::inAttr, String, In1, in1)
     49    DECLARE_ANIMATED_STRING(In1, in1)
    5050    DECLARE_ANIMATED_NUMBER(StdDeviationX, stdDeviationX)
    5151    DECLARE_ANIMATED_NUMBER(StdDeviationY, stdDeviationY)

  • trunk/WebCore/svg/SVGFEImageElement.cpp

    r72474 r73130  
    3333#include "RenderSVGResource.h"
    3434#include "SVGImageBufferTools.h"
    35 #include "SVGLength.h"
    3635#include "SVGNames.h"
    3736#include "SVGPreserveAspectRatio.h"
    3837
    3938namespace WebCore {
     39
     40// Animated property definitions
     41DEFINE_ANIMATED_STRING(SVGFEImageElement, XLinkNames::hrefAttr, Href, href)
    4042
    4143inline SVGFEImageElement::SVGFEImageElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEImageElement.h

    r72474 r73130  
    5858    void requestImageResource();
    5959
     60    // Animated property declarations
    6061    DECLARE_ANIMATED_PROPERTY_NEW(SVGFEImageElement, SVGNames::preserveAspectRatioAttr, SVGPreserveAspectRatio, PreserveAspectRatio, preserveAspectRatio)
    6162
    6263    // SVGURIReference
    63     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEImageElement, XLinkNames::hrefAttr, String, Href, href)
     64    DECLARE_ANIMATED_STRING(Href, href)
    6465
    6566    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGFELightElement.cpp

    r73024 r73130  
    2626
    2727#include "Attribute.h"
     28#include "RenderObject.h"
    2829#include "RenderSVGResource.h"
    2930#include "SVGFilterElement.h"

  • trunk/WebCore/svg/SVGFEMergeNodeElement.cpp

    r72259 r73130  
    2525
    2626#include "Attribute.h"
     27#include "RenderObject.h"
    2728#include "RenderSVGResource.h"
    2829#include "SVGFilterElement.h"
    2930
    3031namespace WebCore {
     32
     33// Animated property definitions
     34DEFINE_ANIMATED_STRING(SVGFEMergeNodeElement, SVGNames::inAttr, In1, in1)
    3135
    3236inline SVGFEMergeNodeElement::SVGFEMergeNodeElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEMergeNodeElement.h

    r71227 r73130  
    2323
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    25 #include "SVGAnimatedPropertyMacros.h"
     25#include "SVGAnimatedString.h"
    2626#include "SVGElement.h"
    2727
    2828namespace WebCore {
    2929
    30     class SVGFEMergeNodeElement : public SVGElement {
    31     public:
    32         static PassRefPtr<SVGFEMergeNodeElement> create(const QualifiedName&, Document*);
     30class SVGFEMergeNodeElement : public SVGElement {
     31public:
     32    static PassRefPtr<SVGFEMergeNodeElement> create(const QualifiedName&, Document*);
    3333
    34     private:
    35         SVGFEMergeNodeElement(const QualifiedName&, Document*);
     34private:
     35    SVGFEMergeNodeElement(const QualifiedName&, Document*);
    3636
    37         virtual void parseMappedAttribute(Attribute*);
    38         virtual void svgAttributeChanged(const QualifiedName&);
    39         virtual void synchronizeProperty(const QualifiedName&);
     37    virtual void parseMappedAttribute(Attribute*);
     38    virtual void svgAttributeChanged(const QualifiedName&);
     39    virtual void synchronizeProperty(const QualifiedName&);
    4040
    41         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEMergeNodeElement, SVGNames::inAttr, String, In1, in1)
    42     };
     41    // Animated property declarations
     42    DECLARE_ANIMATED_STRING(In1, in1)
     43};
    4344
    4445} // namespace WebCore

  • trunk/WebCore/svg/SVGFEMorphologyElement.cpp

    r73024 r73130  
    3030
    3131// Animated property definitions
     32DEFINE_ANIMATED_STRING(SVGFEMorphologyElement, SVGNames::inAttr, In1, in1)
     33DEFINE_ANIMATED_ENUMERATION(SVGFEMorphologyElement, SVGNames::operatorAttr, _operator, _operator)
    3234DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusXIdentifier(), RadiusX, radiusX)
    3335DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusYIdentifier(), RadiusY, radiusY)

  • trunk/WebCore/svg/SVGFEMorphologyElement.h

    r73024 r73130  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEMorphology.h"
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4647
    4748    // Animated property declarations
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEMorphologyElement, SVGNames::inAttr, String, In1, in1)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEMorphologyElement, SVGNames::operatorAttr, int, _operator, _operator)
     49    DECLARE_ANIMATED_STRING(In1, in1)
     50    DECLARE_ANIMATED_ENUMERATION(_operator, _operator)
    5051    DECLARE_ANIMATED_NUMBER(RadiusX, radiusX)
    5152    DECLARE_ANIMATED_NUMBER(RadiusY, radiusY)

  • trunk/WebCore/svg/SVGFEOffsetElement.cpp

    r73024 r73130  
    2929
    3030// Animated property definitions
     31DEFINE_ANIMATED_STRING(SVGFEOffsetElement, SVGNames::inAttr, In1, in1)
    3132DEFINE_ANIMATED_NUMBER(SVGFEOffsetElement, SVGNames::dxAttr, Dx, dx)
    3233DEFINE_ANIMATED_NUMBER(SVGFEOffsetElement, SVGNames::dyAttr, Dy, dy)

  • trunk/WebCore/svg/SVGFEOffsetElement.h

    r73024 r73130  
    4242
    4343    // Animated property declarations
    44     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEOffsetElement, SVGNames::inAttr, String, In1, in1)
     44    DECLARE_ANIMATED_STRING(In1, in1)
    4545    DECLARE_ANIMATED_NUMBER(Dx, dx)
    4646    DECLARE_ANIMATED_NUMBER(Dy, dy)

  • trunk/WebCore/svg/SVGFESpecularLightingElement.cpp

    r73024 r73130  
    2626
    2727#include "Attribute.h"
     28#include "RenderStyle.h"
    2829#include "SVGColor.h"
    2930#include "SVGFELightElement.h"
    … …  
    3435
    3536// Animated property definitions
     37DEFINE_ANIMATED_STRING(SVGFESpecularLightingElement, SVGNames::inAttr, In1, in1)
    3638DEFINE_ANIMATED_NUMBER(SVGFESpecularLightingElement, SVGNames::specularConstantAttr, SpecularConstant, specularConstant)
    3739DEFINE_ANIMATED_NUMBER(SVGFESpecularLightingElement, SVGNames::specularExponentAttr, SpecularExponent, specularExponent)

  • trunk/WebCore/svg/SVGFESpecularLightingElement.h

    r73024 r73130  
    4545
    4646    // Animated property declarations
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFESpecularLightingElement, SVGNames::inAttr, String, In1, in1)
     47    DECLARE_ANIMATED_STRING(In1, in1)
    4848    DECLARE_ANIMATED_NUMBER(SpecularConstant, specularConstant)
    4949    DECLARE_ANIMATED_NUMBER(SpecularExponent, specularExponent)

  • trunk/WebCore/svg/SVGFETileElement.cpp

    r72474 r73130  
    2828
    2929namespace WebCore {
     30
     31// Animated property definitions
     32DEFINE_ANIMATED_STRING(SVGFETileElement, SVGNames::inAttr, In1, in1)
    3033
    3134inline SVGFETileElement::SVGFETileElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFETileElement.h

    r72474 r73130  
    4040    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    4141
    42     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETileElement, SVGNames::inAttr, String, In1, in1)
     42    // Animated property declarations
     43    DECLARE_ANIMATED_STRING(In1, in1)
    4344};
    4445

  • trunk/WebCore/svg/SVGFETurbulenceElement.cpp

    r73024 r73130  
    3333DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFETurbulenceElement, SVGNames::baseFrequencyAttr, baseFrequencyYIdentifier(), BaseFrequencyY, baseFrequencyY)
    3434DEFINE_ANIMATED_NUMBER(SVGFETurbulenceElement, SVGNames::seedAttr, Seed, seed)
     35DEFINE_ANIMATED_ENUMERATION(SVGFETurbulenceElement, SVGNames::stitchTilesAttr, StitchTiles, stitchTiles)
     36DEFINE_ANIMATED_ENUMERATION(SVGFETurbulenceElement, SVGNames::typeAttr, Type, type)
    3537
    3638inline SVGFETurbulenceElement::SVGFETurbulenceElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFETurbulenceElement.h

    r73024 r73130  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FETurbulence.h"
     26#include "SVGAnimatedEnumeration.h"
    2627#include "SVGAnimatedNumber.h"
    2728#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    5556    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::numOctavesAttr, long, NumOctaves, numOctaves)
    5657    DECLARE_ANIMATED_NUMBER(Seed, seed)
    57     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::stitchTilesAttr, int, StitchTiles, stitchTiles)
    58     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::typeAttr, int, Type, type)
     58    DECLARE_ANIMATED_ENUMERATION(StitchTiles, stitchTiles)
     59    DECLARE_ANIMATED_ENUMERATION(Type, type)
    5960};
    6061

  • trunk/WebCore/svg/SVGFilterElement.cpp

    r73016 r73130  
    2828
    2929#include "Attr.h"
    30 #include "FloatSize.h"
    31 #include "PlatformString.h"
    3230#include "RenderSVGResourceFilter.h"
    3331#include "SVGFilterBuilder.h"
    3432#include "SVGFilterPrimitiveStandardAttributes.h"
    35 #include "SVGLength.h"
    3633#include "SVGNames.h"
    3734#include "SVGParserUtilities.h"
    … …  
    4138
    4239// Animated property definitions
     40DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::filterUnitsAttr, FilterUnits, filterUnits)
     41DEFINE_ANIMATED_ENUMERATION(SVGFilterElement, SVGNames::primitiveUnitsAttr, PrimitiveUnits, primitiveUnits)
    4342DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::xAttr, X, x)
    4443DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::yAttr, Y, y)
    4544DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::widthAttr, Width, width)
    4645DEFINE_ANIMATED_LENGTH(SVGFilterElement, SVGNames::heightAttr, Height, height)
     46DEFINE_ANIMATED_STRING(SVGFilterElement, XLinkNames::hrefAttr, Href, href)
    4747
    4848inline SVGFilterElement::SVGFilterElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFilterElement.h

    r73016 r73130  
    2525
    2626#if ENABLE(SVG) && ENABLE(FILTERS)
     27#include "SVGAnimatedEnumeration.h"
    2728#include "SVGAnimatedLength.h"
    28 #include "SVGAnimatedPropertyMacros.h"
    29 #include "RenderObject.h"
    3029#include "SVGExternalResourcesRequired.h"
    3130#include "SVGLangSpace.h"
    … …  
    6362
    6463    // Animated property declarations
    65     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFilterElement, SVGNames::filterUnitsAttr, int, FilterUnits, filterUnits)
    66     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFilterElement, SVGNames::primitiveUnitsAttr, int, PrimitiveUnits, primitiveUnits)
     64    DECLARE_ANIMATED_ENUMERATION(FilterUnits, filterUnits)
     65    DECLARE_ANIMATED_ENUMERATION(PrimitiveUnits, primitiveUnits)
    6766    DECLARE_ANIMATED_LENGTH(X, x)
    6867    DECLARE_ANIMATED_LENGTH(Y, y)
    … …  
    7473
    7574    // SVGURIReference
    76     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFilterElement, XLinkNames::hrefAttr, String, Href, href)
     75    DECLARE_ANIMATED_STRING(Href, href)
    7776
    7877    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGFilterPrimitiveStandardAttributes.cpp

    r73016 r73130  
    4040DEFINE_ANIMATED_LENGTH(SVGFilterPrimitiveStandardAttributes, SVGNames::widthAttr, Width, width)
    4141DEFINE_ANIMATED_LENGTH(SVGFilterPrimitiveStandardAttributes, SVGNames::heightAttr, Height, height)
     42DEFINE_ANIMATED_STRING(SVGFilterPrimitiveStandardAttributes, SVGNames::resultAttr, Result, result)
    4243
    4344SVGFilterPrimitiveStandardAttributes::SVGFilterPrimitiveStandardAttributes(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFilterPrimitiveStandardAttributes.h

    r73016 r73130  
    2626#include "RenderSVGResource.h"
    2727#include "SVGAnimatedLength.h"
    28 #include "SVGAnimatedPropertyMacros.h"
    2928#include "SVGFilterBuilder.h"
    3029#include "SVGFilterElement.h"
    … …  
    6867    DECLARE_ANIMATED_LENGTH(Width, width)
    6968    DECLARE_ANIMATED_LENGTH(Height, height)
    70     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFilterPrimitiveStandardAttributes, SVGNames::resultAttr, String, Result, result)
     69    DECLARE_ANIMATED_STRING(Result, result)
    7170};
    7271

  • trunk/WebCore/svg/SVGForeignObjectElement.cpp

    r73016 r73130  
    3939DEFINE_ANIMATED_LENGTH(SVGForeignObjectElement, SVGNames::widthAttr, Width, width)
    4040DEFINE_ANIMATED_LENGTH(SVGForeignObjectElement, SVGNames::heightAttr, Height, height)
     41DEFINE_ANIMATED_STRING(SVGForeignObjectElement, XLinkNames::hrefAttr, Href, href)
    4142
    4243inline SVGForeignObjectElement::SVGForeignObjectElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGForeignObjectElement.h

    r73016 r73130  
    5959
    6060    // SVGURIReference
    61     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGForeignObjectElement, XLinkNames::hrefAttr, String, Href, href)
     61    DECLARE_ANIMATED_STRING(Href, href)
    6262
    6363    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGGradientElement.cpp

    r73020 r73130  
    4040
    4141// Animated property definitions
     42DEFINE_ANIMATED_ENUMERATION(SVGGradientElement, SVGNames::spreadMethodAttr, SpreadMethod, spreadMethod)
     43DEFINE_ANIMATED_ENUMERATION(SVGGradientElement, SVGNames::gradientUnitsAttr, GradientUnits, gradientUnits)
    4244DEFINE_ANIMATED_TRANSFORM_LIST(SVGGradientElement, SVGNames::gradientTransformAttr, GradientTransform, gradientTransform)
     45DEFINE_ANIMATED_STRING(SVGGradientElement, XLinkNames::hrefAttr, Href, href)
    4346
    4447SVGGradientElement::SVGGradientElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGGradientElement.h

    r73020 r73130  
    2424#if ENABLE(SVG)
    2525#include "Gradient.h"
    26 #include "SVGAnimatedPropertyMacros.h"
     26#include "SVGAnimatedEnumeration.h"
    2727#include "SVGAnimatedTransformList.h"
    2828#include "SVGExternalResourcesRequired.h"
    … …  
    5151
    5252    // Animated property declarations
    53     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGGradientElement, SVGNames::spreadMethodAttr, int, SpreadMethod, spreadMethod)
    54     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGGradientElement, SVGNames::gradientUnitsAttr, int, GradientUnits, gradientUnits)
     53    DECLARE_ANIMATED_ENUMERATION(SpreadMethod, spreadMethod)
     54    DECLARE_ANIMATED_ENUMERATION(GradientUnits, gradientUnits)
    5555    DECLARE_ANIMATED_TRANSFORM_LIST(GradientTransform, gradientTransform)
    5656
    5757    // SVGURIReference
    58     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGGradientElement, XLinkNames::hrefAttr, String, Href, href)
     58    DECLARE_ANIMATED_STRING(Href, href)
    5959
    6060    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGImageElement.cpp

    r73016 r73130  
    4343DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::widthAttr, Width, width)
    4444DEFINE_ANIMATED_LENGTH(SVGImageElement, SVGNames::heightAttr, Height, height)
     45DEFINE_ANIMATED_STRING(SVGImageElement, XLinkNames::hrefAttr, Href, href)
    4546
    4647inline SVGImageElement::SVGImageElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGImageElement.h

    r73016 r73130  
    7373
    7474    // SVGURIReference
    75     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGImageElement, XLinkNames::hrefAttr, String, Href, href)
     75    DECLARE_ANIMATED_STRING(Href, href)
    7676
    7777    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGMPathElement.cpp

    r66498 r73130  
    2727
    2828namespace WebCore {
     29
     30// Animated property definitions
     31DEFINE_ANIMATED_STRING(SVGMPathElement, XLinkNames::hrefAttr, Href, href)
    2932
    3033inline SVGMPathElement::SVGMPathElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGMPathElement.h

    r71227 r73130  
    2222
    2323#if ENABLE(SVG)
    24 #include "SVGAnimatedPropertyMacros.h"
     24#include "SVGAnimatedString.h"
    2525#include "SVGExternalResourcesRequired.h"
    2626#include "SVGURIReference.h"
    … …  
    2828namespace WebCore {
    2929   
    30     class SVGPathElement;
     30class SVGPathElement;
     31
     32class SVGMPathElement : public SVGElement,
     33                        public SVGURIReference,
     34                        public SVGExternalResourcesRequired {
     35public:
     36    static PassRefPtr<SVGMPathElement> create(const QualifiedName&, Document*);
     37
     38    SVGPathElement* pathElement();
    3139   
    32     class SVGMPathElement : public SVGElement,
    33                             public SVGURIReference,
    34                             public SVGExternalResourcesRequired {
    35     public:
    36         static PassRefPtr<SVGMPathElement> create(const QualifiedName&, Document*);
     40private:
     41    SVGMPathElement(const QualifiedName&, Document*);
     42   
     43    virtual void parseMappedAttribute(Attribute*);
     44    virtual void synchronizeProperty(const QualifiedName&);
    3745
    38         SVGPathElement* pathElement();
    39        
    40     private:
    41         SVGMPathElement(const QualifiedName&, Document*);
    42        
    43         virtual void parseMappedAttribute(Attribute*);
    44         virtual void synchronizeProperty(const QualifiedName&);
    45        
    46         // SVGURIReference
    47         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMPathElement, XLinkNames::hrefAttr, String, Href, href)
     46    // Animated property declarations
    4847
    49         // SVGExternalResourcesRequired
    50         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMPathElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
    51     };
     48    // SVGURIReference
     49    DECLARE_ANIMATED_STRING(Href, href)
     50
     51    // SVGExternalResourcesRequired
     52    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMPathElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
     53};
    5254
    5355} // namespace WebCore

  • trunk/WebCore/svg/SVGMarkerElement.cpp

    r73016 r73130  
    4141DEFINE_ANIMATED_LENGTH(SVGMarkerElement, SVGNames::markerWidthAttr, MarkerWidth, markerWidth)
    4242DEFINE_ANIMATED_LENGTH(SVGMarkerElement, SVGNames::markerHeightAttr, MarkerHeight, markerHeight)
    43 
     43DEFINE_ANIMATED_ENUMERATION(SVGMarkerElement, SVGNames::markerUnitsAttr, MarkerUnits, markerUnits)
     44DEFINE_ANIMATED_ENUMERATION_MULTIPLE_WRAPPERS(SVGMarkerElement, SVGNames::orientAttr, orientTypeIdentifier(), OrientType, orientType)
     45   
    4446inline SVGMarkerElement::SVGMarkerElement(const QualifiedName& tagName, Document* document)
    4547    : SVGStyledElement(tagName, document)

  • trunk/WebCore/svg/SVGMarkerElement.h

    r73016 r73130  
    2525#include "RenderObject.h"
    2626#include "SVGAngle.h"
     27#include "SVGAnimatedEnumeration.h"
    2728#include "SVGAnimatedLength.h"
    28 #include "SVGAnimatedPropertyMacros.h"
    2929#include "SVGExternalResourcesRequired.h"
    3030#include "SVGFitToViewBox.h"
    … …  
    8484    DECLARE_ANIMATED_LENGTH(MarkerWidth, markerWidth)
    8585    DECLARE_ANIMATED_LENGTH(MarkerHeight, markerHeight)
    86     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMarkerElement, SVGNames::markerUnitsAttr, int, MarkerUnits, markerUnits)
    87     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGMarkerElement, SVGNames::orientAttr, orientTypeIdentifier(), int, OrientType, orientType)
     86    DECLARE_ANIMATED_ENUMERATION(MarkerUnits, markerUnits)
     87    DECLARE_ANIMATED_ENUMERATION(OrientType, orientType)
    8888    DECLARE_ANIMATED_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGMarkerElement, SVGNames::orientAttr, orientAngleIdentifier(), SVGAngle, OrientAngle, orientAngle)
    8989

  • trunk/WebCore/svg/SVGMaskElement.cpp

    r73016 r73130  
    3737
    3838// Animated property definitions
     39DEFINE_ANIMATED_ENUMERATION(SVGMaskElement, SVGNames::maskUnitsAttr, MaskUnits, maskUnits)
     40DEFINE_ANIMATED_ENUMERATION(SVGMaskElement, SVGNames::maskContentUnitsAttr, MaskContentUnits, maskContentUnits)
    3941DEFINE_ANIMATED_LENGTH(SVGMaskElement, SVGNames::xAttr, X, x)
    4042DEFINE_ANIMATED_LENGTH(SVGMaskElement, SVGNames::yAttr, Y, y)

  • trunk/WebCore/svg/SVGMaskElement.h

    r73016 r73130  
    2323#if ENABLE(SVG)
    2424#include "RenderObject.h"
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedLength.h"
    26 #include "SVGAnimatedPropertyMacros.h"
    2727#include "SVGExternalResourcesRequired.h"
    2828#include "SVGLangSpace.h"
    … …  
    5757
    5858    // Animated property declarations
    59     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMaskElement, SVGNames::maskUnitsAttr, int, MaskUnits, maskUnits)
    60     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGMaskElement, SVGNames::maskContentUnitsAttr, int, MaskContentUnits, maskContentUnits)
     59    DECLARE_ANIMATED_ENUMERATION(MaskUnits, maskUnits)
     60    DECLARE_ANIMATED_ENUMERATION(MaskContentUnits, maskContentUnits)
    6161    DECLARE_ANIMATED_LENGTH(X, x)
    6262    DECLARE_ANIMATED_LENGTH(Y, y)

  • trunk/WebCore/svg/SVGPatternElement.cpp

    r73020 r73130  
    4848DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::widthAttr, Width, width)
    4949DEFINE_ANIMATED_LENGTH(SVGPatternElement, SVGNames::heightAttr, Height, height)
     50DEFINE_ANIMATED_ENUMERATION(SVGPatternElement, SVGNames::patternUnitsAttr, PatternUnits, patternUnits)
     51DEFINE_ANIMATED_ENUMERATION(SVGPatternElement, SVGNames::patternContentUnitsAttr, PatternContentUnits, patternContentUnits)
    5052DEFINE_ANIMATED_TRANSFORM_LIST(SVGPatternElement, SVGNames::patternTransformAttr, PatternTransform, patternTransform)
     53DEFINE_ANIMATED_STRING(SVGPatternElement, XLinkNames::hrefAttr, Href, href)
    5154
    5255inline SVGPatternElement::SVGPatternElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGPatternElement.h

    r73020 r73130  
    2323
    2424#if ENABLE(SVG)
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedLength.h"
    26 #include "SVGAnimatedPropertyMacros.h"
    2727#include "SVGAnimatedTransformList.h"
    2828#include "SVGExternalResourcesRequired.h"
    … …  
    7070    DECLARE_ANIMATED_LENGTH(Width, width)
    7171    DECLARE_ANIMATED_LENGTH(Height, height)
    72     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGPatternElement, SVGNames::patternUnitsAttr, int, PatternUnits, patternUnits)
    73     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGPatternElement, SVGNames::patternContentUnitsAttr, int, PatternContentUnits, patternContentUnits)
     72    DECLARE_ANIMATED_ENUMERATION(PatternUnits, patternUnits)
     73    DECLARE_ANIMATED_ENUMERATION(PatternContentUnits, patternContentUnits)
    7474    DECLARE_ANIMATED_TRANSFORM_LIST(PatternTransform, patternTransform)
    7575
    7676    // SVGURIReference
    77     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGPatternElement, XLinkNames::hrefAttr, String, Href, href)
     77    DECLARE_ANIMATED_STRING(Href, href)
    7878
    7979    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGScriptElement.cpp

    r72995 r73130  
    3232namespace WebCore {
    3333
     34// Animated property definitions
     35DEFINE_ANIMATED_STRING(SVGScriptElement, XLinkNames::hrefAttr, Href, href)
     36
    3437inline SVGScriptElement::SVGScriptElement(const QualifiedName& tagName, Document* document, bool wasInsertedByParser, bool wasAlreadyStarted)
    3538    : SVGElement(tagName, document)

  • trunk/WebCore/svg/SVGScriptElement.h

    r72995 r73130  
    2323
    2424#if ENABLE(SVG)
    25 #include "SVGAnimatedPropertyMacros.h"
     25#include "SVGAnimatedString.h"
    2626#include "SVGElement.h"
    2727#include "SVGExternalResourcesRequired.h"
    … …  
    3131namespace WebCore {
    3232
    33     class SVGScriptElement : public SVGElement
    34                            , public SVGURIReference
    35                            , public SVGExternalResourcesRequired
    36                            , public ScriptElement {
    37     public:
    38         static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document*, bool wasInsertedByParser);
     33class SVGScriptElement : public SVGElement
     34                       , public SVGURIReference
     35                       , public SVGExternalResourcesRequired
     36                       , public ScriptElement {
     37public:
     38    static PassRefPtr<SVGScriptElement> create(const QualifiedName&, Document*, bool wasInsertedByParser);
    3939
    40         String type() const;
    41         void setType(const String&);
     40    String type() const;
     41    void setType(const String&);
    4242
    43     private:
    44         SVGScriptElement(const QualifiedName&, Document*, bool wasInsertedByParser, bool wasAlreadyStarted);
     43private:
     44    SVGScriptElement(const QualifiedName&, Document*, bool wasInsertedByParser, bool wasAlreadyStarted);
    4545
    46         virtual void parseMappedAttribute(Attribute*);
    47         virtual void insertedIntoDocument();
    48         virtual void removedFromDocument();
    49         virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
     46    virtual void parseMappedAttribute(Attribute*);
     47    virtual void insertedIntoDocument();
     48    virtual void removedFromDocument();
     49    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
    5050
    51         virtual void svgAttributeChanged(const QualifiedName&);
    52         virtual void synchronizeProperty(const QualifiedName&);
    53         virtual bool isURLAttribute(Attribute*) const;
    54         virtual void finishParsingChildren();
     51    virtual void svgAttributeChanged(const QualifiedName&);
     52    virtual void synchronizeProperty(const QualifiedName&);
     53    virtual bool isURLAttribute(Attribute*) const;
     54    virtual void finishParsingChildren();
    5555
    56         virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
     56    virtual void addSubresourceAttributeURLs(ListHashSet<KURL>&) const;
    5757
    58         virtual bool haveLoadedRequiredResources();
     58    virtual bool haveLoadedRequiredResources();
    5959
    60         virtual String sourceAttributeValue() const;
    61         virtual String charsetAttributeValue() const;
    62         virtual String typeAttributeValue() const;
    63         virtual String languageAttributeValue() const;
    64         virtual String forAttributeValue() const;
    65         virtual String eventAttributeValue() const;
    66         virtual bool asyncAttributeValue() const;
    67         virtual bool deferAttributeValue() const;
     60    virtual String sourceAttributeValue() const;
     61    virtual String charsetAttributeValue() const;
     62    virtual String typeAttributeValue() const;
     63    virtual String languageAttributeValue() const;
     64    virtual String forAttributeValue() const;
     65    virtual String eventAttributeValue() const;
     66    virtual bool asyncAttributeValue() const;
     67    virtual bool deferAttributeValue() const;
    6868
    69         virtual void dispatchLoadEvent();
    70         virtual void dispatchErrorEvent();
     69    virtual void dispatchLoadEvent();
     70    virtual void dispatchErrorEvent();
    7171
    72         PassRefPtr<Element> cloneElementWithoutAttributesAndChildren() const;
     72    PassRefPtr<Element> cloneElementWithoutAttributesAndChildren() const;
    7373
    74         // SVGURIReference
    75         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGScriptElement, XLinkNames::hrefAttr, String, Href, href)
     74    // Animated property declarations
    7675
    77         // SVGExternalResourcesRequired
    78         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGScriptElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
     76    // SVGURIReference
     77    DECLARE_ANIMATED_STRING(Href, href)
    7978
    80         String m_type;
    81     };
     79    // SVGExternalResourcesRequired
     80    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGScriptElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)
     81
     82    String m_type;
     83};
    8284
    8385} // namespace WebCore

  • trunk/WebCore/svg/SVGStyledElement.cpp

    r72259 r73130  
    4646
    4747namespace WebCore {
     48
     49// Animated property definitions
     50DEFINE_ANIMATED_STRING(SVGStyledElement, HTMLNames::classAttr, ClassName, className)
    4851
    4952using namespace SVGNames;

  • trunk/WebCore/svg/SVGStyledElement.h

    r71227 r73130  
    2323
    2424#if ENABLE(SVG)
    25 #include "SVGAnimatedPropertyMacros.h"
    26 #include "HTMLNames.h"
     25#include "SVGAnimatedString.h"
    2726#include "SVGLocatable.h"
    2827#include "SVGStylable.h"
    … …  
    3130namespace WebCore {
    3231
    33     void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, int>* propertyNameToIdMap, const QualifiedName& attrName);
     32void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, int>* propertyNameToIdMap, const QualifiedName& attrName);
    3433
    35     class SVGStyledElement : public SVGElement,
    36                              public SVGStylable {
    37     public:
    38         virtual ~SVGStyledElement();
     34class SVGStyledElement : public SVGElement,
     35                         public SVGStylable {
     36public:
     37    virtual ~SVGStyledElement();
    3938
    40         virtual String title() const;
     39    virtual String title() const;
    4140
    42         bool hasRelativeLengths() const { return !m_elementsWithRelativeLengths.isEmpty(); }
     41    bool hasRelativeLengths() const { return !m_elementsWithRelativeLengths.isEmpty(); }
    4342
    44         virtual bool supportsMarkers() const { return false; }
     43    virtual bool supportsMarkers() const { return false; }
    4544
    46         virtual PassRefPtr<CSSValue> getPresentationAttribute(const String& name);
     45    virtual PassRefPtr<CSSValue> getPresentationAttribute(const String& name);
    4746
    48         bool isKnownAttribute(const QualifiedName&);
     47    bool isKnownAttribute(const QualifiedName&);
    4948
    50         // Centralized place to force a manual style resolution. Hacky but needed for now.
    51         PassRefPtr<RenderStyle> resolveStyle(RenderStyle* parentStyle);
     49    // Centralized place to force a manual style resolution. Hacky but needed for now.
     50    PassRefPtr<RenderStyle> resolveStyle(RenderStyle* parentStyle);
    5251
    53         bool instanceUpdatesBlocked() const;
    54         void setInstanceUpdatesBlocked(bool);
     52    bool instanceUpdatesBlocked() const;
     53    void setInstanceUpdatesBlocked(bool);
    5554
    56         virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const;
     55    virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const;
    5756
    58         virtual CSSStyleDeclaration* style() { return StyledElement::style(); }
     57    virtual CSSStyleDeclaration* style() { return StyledElement::style(); }
    5958
    60     protected:
    61         SVGStyledElement(const QualifiedName&, Document*);
     59protected:
     60    SVGStyledElement(const QualifiedName&, Document*);
    6261
    63         virtual bool rendererIsNeeded(RenderStyle*);
     62    virtual bool rendererIsNeeded(RenderStyle*);
    6463
    65         virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
    66         virtual void parseMappedAttribute(Attribute*);
    67         virtual void svgAttributeChanged(const QualifiedName&);
    68         virtual void synchronizeProperty(const QualifiedName&);
     64    virtual bool mapToEntry(const QualifiedName&, MappedAttributeEntry&) const;
     65    virtual void parseMappedAttribute(Attribute*);
     66    virtual void svgAttributeChanged(const QualifiedName&);
     67    virtual void synchronizeProperty(const QualifiedName&);
    6968
    70         virtual void attach();
    71         virtual void insertedIntoDocument();
    72         virtual void removedFromDocument();
    73         virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
     69    virtual void attach();
     70    virtual void insertedIntoDocument();
     71    virtual void removedFromDocument();
     72    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
    7473
    75         static int cssPropertyIdForSVGAttributeName(const QualifiedName&);
    76         void updateRelativeLengthsInformation() { updateRelativeLengthsInformation(selfHasRelativeLengths(), this); }
    77         void updateRelativeLengthsInformation(bool hasRelativeLengths, SVGStyledElement*);
     74    static int cssPropertyIdForSVGAttributeName(const QualifiedName&);
     75    void updateRelativeLengthsInformation() { updateRelativeLengthsInformation(selfHasRelativeLengths(), this); }
     76    void updateRelativeLengthsInformation(bool hasRelativeLengths, SVGStyledElement*);
    7877
    79         virtual bool selfHasRelativeLengths() const { return false; }
     78    virtual bool selfHasRelativeLengths() const { return false; }
    8079
    81     private:
    82         virtual bool isStyled() const { return true; }
     80private:
     81    virtual bool isStyled() const { return true; }
    8382
    84         HashSet<SVGStyledElement*> m_elementsWithRelativeLengths;
     83    HashSet<SVGStyledElement*> m_elementsWithRelativeLengths;
    8584
    86         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGStyledElement, HTMLNames::classAttr, String, ClassName, className)
    87     };
     85    // Animated property declarations
     86    DECLARE_ANIMATED_STRING(ClassName, className)
     87};
    8888
    8989} // namespace WebCore

  • trunk/WebCore/svg/SVGTRefElement.cpp

    r66498 r73130  
    3232
    3333namespace WebCore {
     34
     35// Animated property definitions
     36DEFINE_ANIMATED_STRING(SVGTRefElement, XLinkNames::hrefAttr, Href, href)
    3437
    3538inline SVGTRefElement::SVGTRefElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGTRefElement.h

    r71227 r73130  
    2828namespace WebCore {
    2929
    30     class SVGTRefElement : public SVGTextPositioningElement,
    31                            public SVGURIReference {
    32     public:
    33         static PassRefPtr<SVGTRefElement> create(const QualifiedName&, Document*);
     30class SVGTRefElement : public SVGTextPositioningElement,
     31                       public SVGURIReference {
     32public:
     33    static PassRefPtr<SVGTRefElement> create(const QualifiedName&, Document*);
    3434
    35     private:
    36         SVGTRefElement(const QualifiedName&, Document*);
     35private:
     36    SVGTRefElement(const QualifiedName&, Document*);
    3737
    38         virtual void parseMappedAttribute(Attribute*);
    39         virtual void svgAttributeChanged(const QualifiedName&);
    40         virtual void synchronizeProperty(const QualifiedName&);
     38    virtual void parseMappedAttribute(Attribute*);
     39    virtual void svgAttributeChanged(const QualifiedName&);
     40    virtual void synchronizeProperty(const QualifiedName&);
    4141
    42         virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    43         virtual bool childShouldCreateRenderer(Node*) const;
     42    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     43    virtual bool childShouldCreateRenderer(Node*) const;
    4444
    45         void updateReferencedText();
     45    void updateReferencedText();
    4646
    47         // SVGURIReference
    48         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTRefElement, XLinkNames::hrefAttr, String, Href, href)
    49     };
     47    // Animated property declarations
     48
     49    // SVGURIReference
     50    DECLARE_ANIMATED_STRING(Href, href)
     51};
    5052
    5153} // namespace WebCore

  • trunk/WebCore/svg/SVGTextContentElement.cpp

    r73016 r73130  
    3636// Animated property definitions
    3737DEFINE_ANIMATED_LENGTH(SVGTextContentElement, SVGNames::textLengthAttr, TextLength, textLength)
     38DEFINE_ANIMATED_ENUMERATION(SVGTextContentElement, SVGNames::lengthAdjustAttr, LengthAdjust, lengthAdjust)
    3839
    3940SVGTextContentElement::SVGTextContentElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGTextContentElement.h

    r73016 r73130  
    2323
    2424#if ENABLE(SVG)
     25#include "SVGAnimatedEnumeration.h"
    2526#include "SVGAnimatedLength.h"
    26 #include "SVGAnimatedPropertyMacros.h"
    2727#include "SVGExternalResourcesRequired.h"
    2828#include "SVGLangSpace.h"
    … …  
    7373    // Animated property declarations
    7474    DECLARE_ANIMATED_LENGTH(TextLength, textLength)
    75     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextContentElement, SVGNames::lengthAdjustAttr, int, LengthAdjust, lengthAdjust)
     75    DECLARE_ANIMATED_ENUMERATION(LengthAdjust, lengthAdjust)
    7676
    7777    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGTextPathElement.cpp

    r73016 r73130  
    3232// Animated property definitions
    3333DEFINE_ANIMATED_LENGTH(SVGTextPathElement, SVGNames::startOffsetAttr, StartOffset, startOffset)
     34DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::methodAttr, Method, method)
     35DEFINE_ANIMATED_ENUMERATION(SVGTextPathElement, SVGNames::spacingAttr, Spacing, spacing)
     36DEFINE_ANIMATED_STRING(SVGTextPathElement, XLinkNames::hrefAttr, Href, href)
    3437
    3538inline SVGTextPathElement::SVGTextPathElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGTextPathElement.h

    r73016 r73130  
    7171    // Animated property declarations
    7272    DECLARE_ANIMATED_LENGTH(StartOffset, startOffset)
    73     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::methodAttr, int, Method, method)
    74     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, SVGNames::spacingAttr, int, Spacing, spacing)
     73    DECLARE_ANIMATED_ENUMERATION(Method, method)
     74    DECLARE_ANIMATED_ENUMERATION(Spacing, spacing)
    7575
    7676    // SVGURIReference
    77     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGTextPathElement, XLinkNames::hrefAttr, String, Href, href)
     77    DECLARE_ANIMATED_STRING(Href, href)
    7878};
    7979

  • trunk/WebCore/svg/SVGUseElement.cpp

    r73016 r73130  
    6363DEFINE_ANIMATED_LENGTH(SVGUseElement, SVGNames::widthAttr, Width, width)
    6464DEFINE_ANIMATED_LENGTH(SVGUseElement, SVGNames::heightAttr, Height, height)
     65DEFINE_ANIMATED_STRING(SVGUseElement, XLinkNames::hrefAttr, Href, href)
    6566
    6667inline SVGUseElement::SVGUseElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGUseElement.h

    r73016 r73130  
    110110
    111111    // SVGURIReference
    112     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGUseElement, XLinkNames::hrefAttr, String, Href, href)
     112    DECLARE_ANIMATED_STRING(Href, href)
    113113
    114114    // SVGExternalResourcesRequired
Note: See TracChangeset for help on using the changeset viewer.