diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/svg/SVGFEColorMatrixElement.h | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/svg/SVGFEColorMatrixElement.h')
| -rw-r--r-- | WebCore/svg/SVGFEColorMatrixElement.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/svg/SVGFEColorMatrixElement.h b/WebCore/svg/SVGFEColorMatrixElement.h index dcdeb41..7d7f05d 100644 --- a/WebCore/svg/SVGFEColorMatrixElement.h +++ b/WebCore/svg/SVGFEColorMatrixElement.h @@ -23,8 +23,8 @@ #if ENABLE(SVG) && ENABLE(FILTERS) #include "FEColorMatrix.h" +#include "SVGAnimatedNumberList.h" #include "SVGFilterPrimitiveStandardAttributes.h" -#include "SVGNumberList.h" namespace WebCore { @@ -38,11 +38,12 @@ private: virtual void parseMappedAttribute(Attribute*); virtual void svgAttributeChanged(const QualifiedName&); virtual void synchronizeProperty(const QualifiedName&); - virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*); + virtual PassRefPtr<FilterEffect> build(SVGFilterBuilder*, Filter*); + // Animated property declarations DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEColorMatrixElement, SVGNames::inAttr, String, In1, in1) DECLARE_ANIMATED_STATIC_PROPERTY_NEW(SVGFEColorMatrixElement, SVGNames::typeAttr, int, Type, type) - DECLARE_ANIMATED_LIST_PROPERTY_NEW(SVGFEColorMatrixElement, SVGNames::valuesAttr, SVGNumberList, Values, values) + DECLARE_ANIMATED_NUMBER_LIST(Values, values) }; } // namespace WebCore |