| Index: Source/core/svg/SVGFEMergeNodeElement.cpp
|
| diff --git a/Source/core/svg/SVGFEMergeNodeElement.cpp b/Source/core/svg/SVGFEMergeNodeElement.cpp
|
| index 30df5a14e5fb797fd9e6bc59739efb33bfee4557..45e5b9b75df50dc58bdcb96c725d51e03f721059 100644
|
| --- a/Source/core/svg/SVGFEMergeNodeElement.cpp
|
| +++ b/Source/core/svg/SVGFEMergeNodeElement.cpp
|
| @@ -28,16 +28,16 @@
|
| namespace WebCore {
|
|
|
| // Animated property definitions
|
| -DEFINE_ANIMATED_STRING(SVGFEMergeNodeElement, SVGNames::inAttr, In1, in1)
|
|
|
| BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEMergeNodeElement)
|
| - REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
|
| END_REGISTER_ANIMATED_PROPERTIES
|
|
|
| inline SVGFEMergeNodeElement::SVGFEMergeNodeElement(Document& document)
|
| : SVGElement(SVGNames::feMergeNodeTag, document)
|
| + , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create()))
|
| {
|
| ScriptWrappable::init(this);
|
| + addToPropertyMap(m_in1);
|
| registerAnimatedPropertiesForSVGFEMergeNodeElement();
|
| }
|
|
|
| @@ -61,12 +61,14 @@ void SVGFEMergeNodeElement::parseAttribute(const QualifiedName& name, const Atom
|
| return;
|
| }
|
|
|
| - if (name == SVGNames::inAttr) {
|
| - setIn1BaseValue(value);
|
| - return;
|
| - }
|
| + SVGParsingError parseError = NoError;
|
|
|
| - ASSERT_NOT_REACHED();
|
| + if (name == SVGNames::inAttr)
|
| + m_in1->setBaseValueAsString(value, parseError);
|
| + else
|
| + ASSERT_NOT_REACHED();
|
| +
|
| + reportAttributeParsingError(parseError, name, value);
|
| }
|
|
|
| void SVGFEMergeNodeElement::svgAttributeChanged(const QualifiedName& attrName)
|
|
|