From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001 From: "Shimeng (Simon) Wang" Date: Tue, 7 Dec 2010 17:22:45 -0800 Subject: Merge WebKit at r73109: Initial merge by git. Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8 --- WebCore/svg/SVGComponentTransferFunctionElement.h | 43 ++++++++++++----------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'WebCore/svg/SVGComponentTransferFunctionElement.h') diff --git a/WebCore/svg/SVGComponentTransferFunctionElement.h b/WebCore/svg/SVGComponentTransferFunctionElement.h index e02fc16..7c56507 100644 --- a/WebCore/svg/SVGComponentTransferFunctionElement.h +++ b/WebCore/svg/SVGComponentTransferFunctionElement.h @@ -23,30 +23,31 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "FEComponentTransfer.h" -#include "SVGAnimatedPropertyMacros.h" -#include "SVGNumberList.h" +#include "SVGAnimatedNumber.h" +#include "SVGAnimatedNumberList.h" namespace WebCore { - class SVGComponentTransferFunctionElement : public SVGElement { - public: - ComponentTransferFunction transferFunction() const; - - protected: - SVGComponentTransferFunctionElement(const QualifiedName&, Document*); - - virtual void parseMappedAttribute(Attribute*); - virtual void synchronizeProperty(const QualifiedName&); - - private: - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::typeAttr, int, Type, type) - DECLARE_ANIMATED_LIST_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::tableValuesAttr, SVGNumberList, TableValues, tableValues) - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::slopeAttr, float, Slope, slope) - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::interceptAttr, float, Intercept, intercept) - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::amplitudeAttr, float, Amplitude, amplitude) - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::exponentAttr, float, Exponent, exponent) - DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::offsetAttr, float, Offset, offset) - }; +class SVGComponentTransferFunctionElement : public SVGElement { +public: + ComponentTransferFunction transferFunction() const; + +protected: + SVGComponentTransferFunctionElement(const QualifiedName&, Document*); + + virtual void parseMappedAttribute(Attribute*); + virtual void synchronizeProperty(const QualifiedName&); + +private: + // Animated property declarations + DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGComponentTransferFunctionElement, SVGNames::typeAttr, int, Type, type) + DECLARE_ANIMATED_NUMBER_LIST(TableValues, tableValues) + DECLARE_ANIMATED_NUMBER(Slope, slope) + DECLARE_ANIMATED_NUMBER(Intercept, intercept) + DECLARE_ANIMATED_NUMBER(Amplitude, amplitude) + DECLARE_ANIMATED_NUMBER(Exponent, exponent) + DECLARE_ANIMATED_NUMBER(Offset, offset) +}; } // namespace WebCore -- cgit v1.1