Changeset 73024 in webkit


Ignore:
Timestamp:
Dec 1, 2010 8:36:29 AM (13 years ago)
Author:
Nikolas Zimmermann
Message:

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

Reviewed by Xan Lopez.

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

Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_NUMBER / DEFINE_ANIMATED_NUMBER.
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/SVGAnimatedNumber.h:
  • svg/SVGComponentTransferFunctionElement.cpp:
  • svg/SVGComponentTransferFunctionElement.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/SVGFELightElement.cpp:
  • svg/SVGFELightElement.h:
  • svg/SVGFEMorphologyElement.cpp:
  • svg/SVGFEMorphologyElement.h:
  • svg/SVGFEOffsetElement.cpp:
  • svg/SVGFEOffsetElement.h:
  • svg/SVGFESpecularLightingElement.cpp:
  • svg/SVGFESpecularLightingElement.h:
  • svg/SVGFETurbulenceElement.cpp:
  • svg/SVGFETurbulenceElement.h:
  • svg/SVGPathElement.cpp:
  • svg/SVGPathElement.h:
  • svg/SVGStopElement.cpp:
  • svg/SVGStopElement.h: (WebCore::SVGStopElement::isGradientStop):
Location:
trunk/WebCore
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r73023 r73024  
     12010-12-01  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        Split DECLARE_ANIMATED_PROPERTY* in DECLARE/DEFINE parts for SVGAnimatedNumber
     6        https://bugs.webkit.org/show_bug.cgi?id=50323
     7
     8        Continuing the work on bug 42025: Introduce DECLARE_ANIMATED_NUMBER / DEFINE_ANIMATED_NUMBER.
     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/SVGAnimatedNumber.h:
     14        * svg/SVGComponentTransferFunctionElement.cpp:
     15        * svg/SVGComponentTransferFunctionElement.h:
     16        * svg/SVGFECompositeElement.cpp:
     17        * svg/SVGFECompositeElement.h:
     18        * svg/SVGFEConvolveMatrixElement.cpp:
     19        * svg/SVGFEConvolveMatrixElement.h:
     20        * svg/SVGFEDiffuseLightingElement.cpp:
     21        * svg/SVGFEDiffuseLightingElement.h:
     22        * svg/SVGFEDisplacementMapElement.cpp:
     23        * svg/SVGFEDisplacementMapElement.h:
     24        * svg/SVGFEGaussianBlurElement.cpp:
     25        * svg/SVGFEGaussianBlurElement.h:
     26        * svg/SVGFELightElement.cpp:
     27        * svg/SVGFELightElement.h:
     28        * svg/SVGFEMorphologyElement.cpp:
     29        * svg/SVGFEMorphologyElement.h:
     30        * svg/SVGFEOffsetElement.cpp:
     31        * svg/SVGFEOffsetElement.h:
     32        * svg/SVGFESpecularLightingElement.cpp:
     33        * svg/SVGFESpecularLightingElement.h:
     34        * svg/SVGFETurbulenceElement.cpp:
     35        * svg/SVGFETurbulenceElement.h:
     36        * svg/SVGPathElement.cpp:
     37        * svg/SVGPathElement.h:
     38        * svg/SVGStopElement.cpp:
     39        * svg/SVGStopElement.h:
     40        (WebCore::SVGStopElement::isGradientStop):
     41
    1422010-12-01  Martin Robinson  <mrobinson@igalia.com>
    243

  • trunk/WebCore/svg/SVGAnimatedNumber.h

    r70979 r73024  
    2323#if ENABLE(SVG)
    2424#include "SVGAnimatedStaticPropertyTearOff.h"
     25#include "SVGAnimatedPropertyMacros.h"
    2526
    2627namespace WebCore {
    … …  
    2829typedef SVGAnimatedStaticPropertyTearOff<float> SVGAnimatedNumber;
    2930
     31// Helper macros to declare/define a SVGAnimatedNumber object
     32#define DECLARE_ANIMATED_NUMBER(UpperProperty, LowerProperty) \
     33DECLARE_ANIMATED_PROPERTY(SVGAnimatedNumber, float, UpperProperty, LowerProperty)
     34
     35#define DEFINE_ANIMATED_NUMBER(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
     36DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, DOMAttribute.localName(), SVGAnimatedNumber, float, UpperProperty, LowerProperty)
     37
     38#define DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, UpperProperty, LowerProperty) \
     39DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, SVGDOMAttributeIdentifier, SVGAnimatedNumber, float, UpperProperty, LowerProperty)
     40
    3041} // namespace WebCore
    3142

  • trunk/WebCore/svg/SVGComponentTransferFunctionElement.cpp

    r73020 r73024  
    3333// Animated property definitions
    3434DEFINE_ANIMATED_NUMBER_LIST(SVGComponentTransferFunctionElement, SVGNames::tableValuesAttr, TableValues, tableValues)
     35DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::slopeAttr, Slope, slope)
     36DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::interceptAttr, Intercept, intercept)
     37DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::amplitudeAttr, Amplitude, amplitude)
     38DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::exponentAttr, Exponent, exponent)
     39DEFINE_ANIMATED_NUMBER(SVGComponentTransferFunctionElement, SVGNames::offsetAttr, Offset, offset)
    3540
    3641SVGComponentTransferFunctionElement::SVGComponentTransferFunctionElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGComponentTransferFunctionElement.h

    r73020 r73024  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEComponentTransfer.h"
     26#include "SVGAnimatedNumber.h"
    2627#include "SVGAnimatedNumberList.h"
    27 #include "SVGAnimatedPropertyMacros.h"
    2828
    2929namespace WebCore {
    … …  
    4343    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::typeAttr, int, Type, type)
    4444    DECLARE_ANIMATED_NUMBER_LIST(TableValues, tableValues)
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::slopeAttr, float, Slope, slope)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::interceptAttr, float, Intercept, intercept)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::amplitudeAttr, float, Amplitude, amplitude)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::exponentAttr, float, Exponent, exponent)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::offsetAttr, float, Offset, offset)
     45    DECLARE_ANIMATED_NUMBER(Slope, slope)
     46    DECLARE_ANIMATED_NUMBER(Intercept, intercept)
     47    DECLARE_ANIMATED_NUMBER(Amplitude, amplitude)
     48    DECLARE_ANIMATED_NUMBER(Exponent, exponent)
     49    DECLARE_ANIMATED_NUMBER(Offset, offset)
    5050};
    5151

  • trunk/WebCore/svg/SVGFECompositeElement.cpp

    r72474 r73024  
    2828
    2929namespace WebCore {
     30
     31// Animated property definitions
     32DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k1Attr, K1, k1)
     33DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k2Attr, K2, k2)
     34DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k3Attr, K3, k3)
     35DEFINE_ANIMATED_NUMBER(SVGFECompositeElement, SVGNames::k4Attr, K4, k4)
    3036
    3137inline SVGFECompositeElement::SVGFECompositeElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFECompositeElement.h

    r72474 r73024  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEComposite.h"
     26#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    2728
    … …  
    4041    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    4142
     43    // Animated property declarations
    4244    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::inAttr, String, In1, in1)
    4345    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::in2Attr, String, In2, in2)
    4446    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::operatorAttr, int, _operator, _operator)
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::k1Attr, float, K1, k1)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::k2Attr, float, K2, k2)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::k3Attr, float, K3, k3)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFECompositeElement, SVGNames::k4Attr, float, K4, k4)
     47    DECLARE_ANIMATED_NUMBER(K1, k1)
     48    DECLARE_ANIMATED_NUMBER(K2, k2)
     49    DECLARE_ANIMATED_NUMBER(K3, k3)
     50    DECLARE_ANIMATED_NUMBER(K4, k4)
    4951};
    5052

  • trunk/WebCore/svg/SVGFEConvolveMatrixElement.cpp

    r73020 r73024  
    3434// Animated property definitions
    3535DEFINE_ANIMATED_NUMBER_LIST(SVGFEConvolveMatrixElement, SVGNames::kernelMatrixAttr, KernelMatrix, kernelMatrix)
     36DEFINE_ANIMATED_NUMBER(SVGFEConvolveMatrixElement, SVGNames::divisorAttr, Divisor, divisor)
     37DEFINE_ANIMATED_NUMBER(SVGFEConvolveMatrixElement, SVGNames::biasAttr, Bias, bias)
     38DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), KernelUnitLengthX, kernelUnitLengthX)
     39DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), KernelUnitLengthY, kernelUnitLengthY)
    3640
    3741inline SVGFEConvolveMatrixElement::SVGFEConvolveMatrixElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEConvolveMatrixElement.h

    r73020 r73024  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEConvolveMatrix.h"
     25#include "SVGAnimatedNumber.h"
    2526#include "SVGAnimatedNumberList.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    … …  
    4142    virtual void svgAttributeChanged(const QualifiedName&);
    4243    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
     44
    4345    static const AtomicString& orderXIdentifier();
    4446    static const AtomicString& orderYIdentifier();
    45 
    4647    static const AtomicString& kernelUnitLengthXIdentifier();
    4748    static const AtomicString& kernelUnitLengthYIdentifier();
    … …  
    5253    DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEConvolveMatrixElement, SVGNames::orderAttr, orderYIdentifier(), long, OrderY, orderY)
    5354    DECLARE_ANIMATED_NUMBER_LIST(KernelMatrix, kernelMatrix)
    54     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::divisorAttr, float, Divisor, divisor)
    55     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::biasAttr, float, Bias, bias)
     55    DECLARE_ANIMATED_NUMBER(Divisor, divisor)
     56    DECLARE_ANIMATED_NUMBER(Bias, bias)
    5657    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::targetXAttr, long, TargetX, targetX)
    5758    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::targetYAttr, long, TargetY, targetY)
    5859    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::operatorAttr, int, EdgeMode, edgeMode)
    59     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), float, KernelUnitLengthX, kernelUnitLengthX)
    60     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEConvolveMatrixElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), float, KernelUnitLengthY, kernelUnitLengthY)
     60    DECLARE_ANIMATED_NUMBER(KernelUnitLengthX, kernelUnitLengthX)
     61    DECLARE_ANIMATED_NUMBER(KernelUnitLengthY, kernelUnitLengthY)
    6162    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEConvolveMatrixElement, SVGNames::preserveAlphaAttr, bool, PreserveAlpha, preserveAlpha)
    6263};

  • trunk/WebCore/svg/SVGFEDiffuseLightingElement.cpp

    r72474 r73024  
    3232
    3333namespace WebCore {
     34
     35// Animated property definitions
     36DEFINE_ANIMATED_NUMBER(SVGFEDiffuseLightingElement, SVGNames::diffuseConstantAttr, DiffuseConstant, diffuseConstant)
     37DEFINE_ANIMATED_NUMBER(SVGFEDiffuseLightingElement, SVGNames::surfaceScaleAttr, SurfaceScale, surfaceScale)
     38DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEDiffuseLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), KernelUnitLengthX, kernelUnitLengthX)
     39DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEDiffuseLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), KernelUnitLengthY, kernelUnitLengthY)
    3440
    3541inline SVGFEDiffuseLightingElement::SVGFEDiffuseLightingElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEDiffuseLightingElement.h

    r72474 r73024  
    4747    static const AtomicString& kernelUnitLengthYIdentifier();
    4848
     49    // Animated property declarations
    4950    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDiffuseLightingElement, SVGNames::inAttr, String, In1, in1)
    50     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDiffuseLightingElement, SVGNames::diffuseConstantAttr, float, DiffuseConstant, diffuseConstant)
    51     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDiffuseLightingElement, SVGNames::surfaceScaleAttr, float, SurfaceScale, surfaceScale)
    52     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEDiffuseLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), float, KernelUnitLengthX, kernelUnitLengthX)
    53     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEDiffuseLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), float, KernelUnitLengthY, kernelUnitLengthY)
     51    DECLARE_ANIMATED_NUMBER(DiffuseConstant, diffuseConstant)
     52    DECLARE_ANIMATED_NUMBER(SurfaceScale, surfaceScale)
     53    DECLARE_ANIMATED_NUMBER(KernelUnitLengthX, kernelUnitLengthX)
     54    DECLARE_ANIMATED_NUMBER(KernelUnitLengthY, kernelUnitLengthY)
    5455
    5556    PassRefPtr<LightSource> findLights() const;

  • trunk/WebCore/svg/SVGFEDisplacementMapElement.cpp

    r72474 r73024  
    2626
    2727namespace WebCore {
     28
     29// Animated property definitions
     30DEFINE_ANIMATED_NUMBER(SVGFEDisplacementMapElement, SVGNames::scaleAttr, Scale, scale)
    2831
    2932inline SVGFEDisplacementMapElement::SVGFEDisplacementMapElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEDisplacementMapElement.h

    r72474 r73024  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEDisplacementMap.h"
     25#include "SVGAnimatedNumber.h"
    2526#include "SVGFilterPrimitiveStandardAttributes.h"
    2627
    … …  
    4041    virtual void synchronizeProperty(const QualifiedName&);
    4142    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    42    
     43
     44    // Animated property declarations
    4345    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::inAttr, String, In1, in1)
    4446    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::in2Attr, String, In2, in2)
    4547    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::xChannelSelectorAttr, int, XChannelSelector, xChannelSelector)
    4648    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::yChannelSelectorAttr, int, YChannelSelector, yChannelSelector)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEDisplacementMapElement, SVGNames::scaleAttr, float, Scale, scale)
     49    DECLARE_ANIMATED_NUMBER(Scale, scale)
    4850};
    4951

  • trunk/WebCore/svg/SVGFEGaussianBlurElement.cpp

    r72474 r73024  
    2929
    3030namespace WebCore {
     31
     32// Animated property definitions
     33DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationXIdentifier(), StdDeviationX, stdDeviationX)
     34DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationYIdentifier(), StdDeviationY, stdDeviationY)
    3135
    3236inline SVGFEGaussianBlurElement::SVGFEGaussianBlurElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEGaussianBlurElement.h

    r72474 r73024  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEGaussianBlur.h"
     26#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    2728
    … …  
    4546    static const AtomicString& stdDeviationYIdentifier();
    4647
     48    // Animated property declarations
    4749    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEGaussianBlurElement, SVGNames::inAttr, String, In1, in1)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationXIdentifier(), float, StdDeviationX, stdDeviationX)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEGaussianBlurElement, SVGNames::stdDeviationAttr, stdDeviationYIdentifier(), float, StdDeviationY, stdDeviationY)
     50    DECLARE_ANIMATED_NUMBER(StdDeviationX, stdDeviationX)
     51    DECLARE_ANIMATED_NUMBER(StdDeviationY, stdDeviationY)
    5052};
    5153

  • trunk/WebCore/svg/SVGFELightElement.cpp

    r72259 r73024  
    3131
    3232namespace WebCore {
     33
     34// Animated property definitions
     35DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::azimuthAttr, Azimuth, azimuth)
     36DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::elevationAttr, Elevation, elevation)
     37DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::xAttr, X, x)
     38DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::yAttr, Y, y)
     39DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::zAttr, Z, z)
     40DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtXAttr, PointsAtX, pointsAtX)
     41DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtYAttr, PointsAtY, pointsAtY)
     42DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::pointsAtZAttr, PointsAtZ, pointsAtZ)
     43DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::specularExponentAttr, SpecularExponent, specularExponent)
     44DEFINE_ANIMATED_NUMBER(SVGFELightElement, SVGNames::limitingConeAngleAttr, LimitingConeAngle, limitingConeAngle)
    3345
    3446SVGFELightElement::SVGFELightElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFELightElement.h

    r70979 r73024  
    2525#if ENABLE(SVG) && ENABLE(FILTERS)
    2626#include "LightSource.h"
    27 #include "SVGAnimatedPropertyMacros.h"
     27#include "SVGAnimatedNumber.h"
    2828#include "SVGElement.h"
    2929
    … …  
    4343    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
    4444
    45     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::azimuthAttr, float, Azimuth, azimuth)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::elevationAttr, float, Elevation, elevation)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::xAttr, float, X, x)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::yAttr, float, Y, y)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::zAttr, float, Z, z)
    50     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::pointsAtXAttr, float, PointsAtX, pointsAtX)
    51     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::pointsAtYAttr, float, PointsAtY, pointsAtY)
    52     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::pointsAtZAttr, float, PointsAtZ, pointsAtZ)
    53     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::specularExponentAttr, float, SpecularExponent, specularExponent)
    54     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFELightElement, SVGNames::limitingConeAngleAttr, float, LimitingConeAngle, limitingConeAngle)
     45    // Animated property declarations
     46    DECLARE_ANIMATED_NUMBER(Azimuth, azimuth)
     47    DECLARE_ANIMATED_NUMBER(Elevation, elevation)
     48    DECLARE_ANIMATED_NUMBER(X, x)
     49    DECLARE_ANIMATED_NUMBER(Y, y)
     50    DECLARE_ANIMATED_NUMBER(Z, z)
     51    DECLARE_ANIMATED_NUMBER(PointsAtX, pointsAtX)
     52    DECLARE_ANIMATED_NUMBER(PointsAtY, pointsAtY)
     53    DECLARE_ANIMATED_NUMBER(PointsAtZ, pointsAtZ)
     54    DECLARE_ANIMATED_NUMBER(SpecularExponent, specularExponent)
     55    DECLARE_ANIMATED_NUMBER(LimitingConeAngle, limitingConeAngle)
    5556};
    5657

  • trunk/WebCore/svg/SVGFEMorphologyElement.cpp

    r72474 r73024  
    2828
    2929namespace WebCore {
     30
     31// Animated property definitions
     32DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusXIdentifier(), RadiusX, radiusX)
     33DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusYIdentifier(), RadiusY, radiusY)
    3034
    3135inline SVGFEMorphologyElement::SVGFEMorphologyElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEMorphologyElement.h

    r72474 r73024  
    2323#if ENABLE(SVG) && ENABLE(FILTERS)
    2424#include "FEMorphology.h"
     25#include "SVGAnimatedNumber.h"
    2526#include "SVGFilterPrimitiveStandardAttributes.h"
    2627
    … …  
    4445    static const AtomicString& radiusYIdentifier();
    4546
     47    // Animated property declarations
    4648    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEMorphologyElement, SVGNames::inAttr, String, In1, in1)
    4749    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEMorphologyElement, SVGNames::operatorAttr, int, _operator, _operator)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusXIdentifier(), float, RadiusX, radiusX)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFEMorphologyElement, SVGNames::radiusAttr, radiusYIdentifier(), float, RadiusY, radiusY)
     50    DECLARE_ANIMATED_NUMBER(RadiusX, radiusX)
     51    DECLARE_ANIMATED_NUMBER(RadiusY, radiusY)
    5052};
    5153

  • trunk/WebCore/svg/SVGFEOffsetElement.cpp

    r72474 r73024  
    2727
    2828namespace WebCore {
     29
     30// Animated property definitions
     31DEFINE_ANIMATED_NUMBER(SVGFEOffsetElement, SVGNames::dxAttr, Dx, dx)
     32DEFINE_ANIMATED_NUMBER(SVGFEOffsetElement, SVGNames::dyAttr, Dy, dy)
    2933
    3034inline SVGFEOffsetElement::SVGFEOffsetElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFEOffsetElement.h

    r72474 r73024  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FEOffset.h"
     26#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    2728
    … …  
    4041    virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*);
    4142
     43    // Animated property declarations
    4244    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEOffsetElement, SVGNames::inAttr, String, In1, in1)
    43     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEOffsetElement, SVGNames::dxAttr, float, Dx, dx)
    44     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEOffsetElement, SVGNames::dyAttr, float, Dy, dy)
     45    DECLARE_ANIMATED_NUMBER(Dx, dx)
     46    DECLARE_ANIMATED_NUMBER(Dy, dy)
    4547};
    4648

  • trunk/WebCore/svg/SVGFESpecularLightingElement.cpp

    r72474 r73024  
    3232
    3333namespace WebCore {
     34
     35// Animated property definitions
     36DEFINE_ANIMATED_NUMBER(SVGFESpecularLightingElement, SVGNames::specularConstantAttr, SpecularConstant, specularConstant)
     37DEFINE_ANIMATED_NUMBER(SVGFESpecularLightingElement, SVGNames::specularExponentAttr, SpecularExponent, specularExponent)
     38DEFINE_ANIMATED_NUMBER(SVGFESpecularLightingElement, SVGNames::surfaceScaleAttr, SurfaceScale, surfaceScale)
     39DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFESpecularLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), KernelUnitLengthX, kernelUnitLengthX)
     40DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFESpecularLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), KernelUnitLengthY, kernelUnitLengthY)
    3441
    3542inline SVGFESpecularLightingElement::SVGFESpecularLightingElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFESpecularLightingElement.h

    r72474 r73024  
    2525#if ENABLE(SVG) && ENABLE(FILTERS)
    2626#include "FESpecularLighting.h"
     27#include "SVGAnimatedNumber.h"
    2728#include "SVGFilterPrimitiveStandardAttributes.h"
    2829
    … …  
    4344    static const AtomicString& kernelUnitLengthYIdentifier();
    4445
     46    // Animated property declarations
    4547    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFESpecularLightingElement, SVGNames::inAttr, String, In1, in1)
    46     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFESpecularLightingElement, SVGNames::specularConstantAttr, float, SpecularConstant, specularConstant)
    47     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFESpecularLightingElement, SVGNames::specularExponentAttr, float, SpecularExponent, specularExponent)
    48     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFESpecularLightingElement, SVGNames::surfaceScaleAttr, float, SurfaceScale, surfaceScale)
    49     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFESpecularLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthXIdentifier(), float, KernelUnitLengthX, kernelUnitLengthX)
    50     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFESpecularLightingElement, SVGNames::kernelUnitLengthAttr, kernelUnitLengthYIdentifier(), float, KernelUnitLengthY, kernelUnitLengthY)
     48    DECLARE_ANIMATED_NUMBER(SpecularConstant, specularConstant)
     49    DECLARE_ANIMATED_NUMBER(SpecularExponent, specularExponent)
     50    DECLARE_ANIMATED_NUMBER(SurfaceScale, surfaceScale)
     51    DECLARE_ANIMATED_NUMBER(KernelUnitLengthX, kernelUnitLengthX)
     52    DECLARE_ANIMATED_NUMBER(KernelUnitLengthY, kernelUnitLengthY)
    5153
    5254    PassRefPtr<LightSource> findLights() const;

  • trunk/WebCore/svg/SVGFETurbulenceElement.cpp

    r72474 r73024  
    2828
    2929namespace WebCore {
     30
     31// Animated property definitions
     32DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFETurbulenceElement, SVGNames::baseFrequencyAttr, baseFrequencyXIdentifier(), BaseFrequencyX, baseFrequencyX)
     33DEFINE_ANIMATED_NUMBER_MULTIPLE_WRAPPERS(SVGFETurbulenceElement, SVGNames::baseFrequencyAttr, baseFrequencyYIdentifier(), BaseFrequencyY, baseFrequencyY)
     34DEFINE_ANIMATED_NUMBER(SVGFETurbulenceElement, SVGNames::seedAttr, Seed, seed)
    3035
    3136inline SVGFETurbulenceElement::SVGFETurbulenceElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGFETurbulenceElement.h

    r72474 r73024  
    2424#if ENABLE(SVG) && ENABLE(FILTERS)
    2525#include "FETurbulence.h"
     26#include "SVGAnimatedNumber.h"
    2627#include "SVGFilterPrimitiveStandardAttributes.h"
    2728
    … …  
    4950    static const AtomicString& baseFrequencyYIdentifier();
    5051
    51     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFETurbulenceElement, SVGNames::baseFrequencyAttr, baseFrequencyXIdentifier(), float, BaseFrequencyX, baseFrequencyX)
    52     DECLARE_ANIMATED_STATIC_PROPERTY_MULTIPLE_WRAPPERS_NEW(SVGFETurbulenceElement, SVGNames::baseFrequencyAttr, baseFrequencyYIdentifier(), float, BaseFrequencyY, baseFrequencyY)
     52    // Animated property declarations
     53    DECLARE_ANIMATED_NUMBER(BaseFrequencyX, baseFrequencyX)
     54    DECLARE_ANIMATED_NUMBER(BaseFrequencyY, baseFrequencyY)
    5355    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::numOctavesAttr, long, NumOctaves, numOctaves)
    54     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::seedAttr, float, Seed, seed)
     56    DECLARE_ANIMATED_NUMBER(Seed, seed)
    5557    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::stitchTilesAttr, int, StitchTiles, stitchTiles)
    5658    DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFETurbulenceElement, SVGNames::typeAttr, int, Type, type)

  • trunk/WebCore/svg/SVGPathElement.cpp

    r72518 r73024  
    4545namespace WebCore {
    4646
     47// Animated property definitions
     48DEFINE_ANIMATED_NUMBER(SVGPathElement, SVGNames::pathLengthAttr, PathLength, pathLength)
     49
    4750inline SVGPathElement::SVGPathElement(const QualifiedName& tagName, Document* document)
    4851    : SVGStyledTransformableElement(tagName, document)

  • trunk/WebCore/svg/SVGPathElement.h

    r72381 r73024  
    2323
    2424#if ENABLE(SVG)
     25#include "SVGAnimatedNumber.h"
    2526#include "SVGAnimatedPathSegListPropertyTearOff.h"
    26 #include "SVGAnimatedPropertyMacros.h"
    2727#include "SVGExternalResourcesRequired.h"
    2828#include "SVGLangSpace.h"
    … …  
    106106    virtual bool supportsMarkers() const { return true; }
    107107
    108     DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGPathElement, SVGNames::pathLengthAttr, float, PathLength, pathLength)
     108    // Animated property declarations
     109    DECLARE_ANIMATED_NUMBER(PathLength, pathLength)
    109110
    110111    // SVGExternalResourcesRequired

  • trunk/WebCore/svg/SVGStopElement.cpp

    r66498 r73024  
    3232
    3333namespace WebCore {
     34
     35// Animated property definitions
     36DEFINE_ANIMATED_NUMBER(SVGStopElement, SVGNames::offsetAttr, Offset, offset)
    3437
    3538inline SVGStopElement::SVGStopElement(const QualifiedName& tagName, Document* document)

  • trunk/WebCore/svg/SVGStopElement.h

    r70979 r73024  
    2323
    2424#if ENABLE(SVG)
    25 #include "SVGAnimatedPropertyMacros.h"
     25#include "SVGAnimatedNumber.h"
    2626#include "SVGStyledElement.h"
    2727
    2828namespace WebCore {
    2929
    30     class SVGStopElement : public SVGStyledElement {
    31     public:
    32         static PassRefPtr<SVGStopElement> create(const QualifiedName&, Document*);
     30class SVGStopElement : public SVGStyledElement {
     31public:
     32    static PassRefPtr<SVGStopElement> create(const QualifiedName&, Document*);
    3333
    34         Color stopColorIncludingOpacity() const;
     34    Color stopColorIncludingOpacity() const;
    3535
    36     private:
    37         SVGStopElement(const QualifiedName&, Document*);
     36private:
     37    SVGStopElement(const QualifiedName&, Document*);
    3838
    39         virtual void parseMappedAttribute(Attribute*);
    40         virtual void svgAttributeChanged(const QualifiedName&);
    41         virtual void synchronizeProperty(const QualifiedName&);
     39    virtual void parseMappedAttribute(Attribute*);
     40    virtual void svgAttributeChanged(const QualifiedName&);
     41    virtual void synchronizeProperty(const QualifiedName&);
    4242
    43         virtual bool isGradientStop() const { return true; }
     43    virtual bool isGradientStop() const { return true; }
    4444
    45         virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
     45    virtual RenderObject* createRenderer(RenderArena*, RenderStyle*);
    4646
    47         DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGStopElement, SVGNames::offsetAttr, float, Offset, offset)
    48     };
     47    // Animated property declarations
     48    DECLARE_ANIMATED_NUMBER(Offset, offset)
     49};
    4950
    5051} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.