| Index: Source/core/svg/SVGFEMorphologyElement.cpp
|
| diff --git a/Source/core/svg/SVGFEMorphologyElement.cpp b/Source/core/svg/SVGFEMorphologyElement.cpp
|
| index bc18e074782c809c0b82f9f28cbde95196871a8b..c0ea10e8297215754616c9a096b4ec590b3c79a2 100644
|
| --- a/Source/core/svg/SVGFEMorphologyElement.cpp
|
| +++ b/Source/core/svg/SVGFEMorphologyElement.cpp
|
| @@ -30,11 +30,9 @@
|
| namespace WebCore {
|
|
|
| // Animated property definitions
|
| -DEFINE_ANIMATED_STRING(SVGFEMorphologyElement, SVGNames::inAttr, In1, in1)
|
| DEFINE_ANIMATED_ENUMERATION(SVGFEMorphologyElement, SVGNames::operatorAttr, SVGOperator, svgOperator, MorphologyOperatorType)
|
|
|
| BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEMorphologyElement)
|
| - REGISTER_LOCAL_ANIMATED_PROPERTY(in1)
|
| REGISTER_LOCAL_ANIMATED_PROPERTY(svgOperator)
|
| REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes)
|
| END_REGISTER_ANIMATED_PROPERTIES
|
| @@ -42,11 +40,13 @@ END_REGISTER_ANIMATED_PROPERTIES
|
| inline SVGFEMorphologyElement::SVGFEMorphologyElement(Document& document)
|
| : SVGFilterPrimitiveStandardAttributes(SVGNames::feMorphologyTag, document)
|
| , m_radius(SVGAnimatedNumberOptionalNumber::create(this, SVGNames::radiusAttr))
|
| + , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create()))
|
| , m_svgOperator(FEMORPHOLOGY_OPERATOR_ERODE)
|
| {
|
| ScriptWrappable::init(this);
|
|
|
| addToPropertyMap(m_radius);
|
| + addToPropertyMap(m_in1);
|
| registerAnimatedPropertiesForSVGFEMorphologyElement();
|
| }
|
|
|
| @@ -87,14 +87,11 @@ void SVGFEMorphologyElement::parseAttribute(const QualifiedName& name, const Ato
|
| return;
|
| }
|
|
|
| - if (name == SVGNames::inAttr) {
|
| - setIn1BaseValue(value);
|
| - return;
|
| - }
|
| -
|
| SVGParsingError parseError = NoError;
|
|
|
| - if (name == SVGNames::radiusAttr)
|
| + if (name == SVGNames::inAttr)
|
| + m_in1->setBaseValueAsString(value, parseError);
|
| + else if (name == SVGNames::radiusAttr)
|
| m_radius->setBaseValueAsString(value, parseError);
|
| else
|
| ASSERT_NOT_REACHED();
|
| @@ -142,7 +139,7 @@ void SVGFEMorphologyElement::svgAttributeChanged(const QualifiedName& attrName)
|
|
|
| PassRefPtr<FilterEffect> SVGFEMorphologyElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
|
| {
|
| - FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(in1CurrentValue()));
|
| + FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->currentValue()->value()));
|
| float xRadius = radiusX()->currentValue()->value();
|
| float yRadius = radiusY()->currentValue()->value();
|
|
|
|
|