diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/svg/SVGFEColorMatrixElement.cpp | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/svg/SVGFEColorMatrixElement.cpp')
-rw-r--r-- | Source/WebCore/svg/SVGFEColorMatrixElement.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp index d3229d0..19acf0f 100644 --- a/Source/WebCore/svg/SVGFEColorMatrixElement.cpp +++ b/Source/WebCore/svg/SVGFEColorMatrixElement.cpp @@ -69,13 +69,26 @@ void SVGFEColorMatrixElement::parseMappedAttribute(Attribute* attr) SVGFilterPrimitiveStandardAttributes::parseMappedAttribute(attr); } +bool SVGFEColorMatrixElement::setFilterEffectAttribute(FilterEffect* effect, const QualifiedName& attrName) +{ + FEColorMatrix* colorMatrix = static_cast<FEColorMatrix*>(effect); + if (attrName == SVGNames::typeAttr) + return colorMatrix->setType(static_cast<ColorMatrixType>(type())); + if (attrName == SVGNames::valuesAttr) + return colorMatrix->setValues(values()); + + ASSERT_NOT_REACHED(); + return false; +} + void SVGFEColorMatrixElement::svgAttributeChanged(const QualifiedName& attrName) { SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName); if (attrName == SVGNames::typeAttr - || attrName == SVGNames::inAttr || attrName == SVGNames::valuesAttr) + primitiveAttributeChanged(attrName); + if (attrName == SVGNames::inAttr) invalidate(); } |