Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

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();
 }