Index: Source/core/svg/SVGFEOffsetElement.cpp |
diff --git a/Source/core/svg/SVGFEOffsetElement.cpp b/Source/core/svg/SVGFEOffsetElement.cpp |
index c3ccb4cb3bce8a18902c8be00c44ffa6ee7dfcf0..585a9d403bce31a7b9af61fd8e9f229aabc93e70 100644 |
--- a/Source/core/svg/SVGFEOffsetElement.cpp |
+++ b/Source/core/svg/SVGFEOffsetElement.cpp |
@@ -30,10 +30,8 @@ |
namespace WebCore { |
// Animated property definitions |
-DEFINE_ANIMATED_STRING(SVGFEOffsetElement, SVGNames::inAttr, In1, in1) |
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFEOffsetElement) |
- REGISTER_LOCAL_ANIMATED_PROPERTY(in1) |
REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes) |
END_REGISTER_ANIMATED_PROPERTIES |
@@ -41,11 +39,13 @@ inline SVGFEOffsetElement::SVGFEOffsetElement(Document& document) |
: SVGFilterPrimitiveStandardAttributes(SVGNames::feOffsetTag, document) |
, m_dx(SVGAnimatedNumber::create(this, SVGNames::dxAttr, SVGNumber::create())) |
, m_dy(SVGAnimatedNumber::create(this, SVGNames::dyAttr, SVGNumber::create())) |
+ , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create())) |
{ |
ScriptWrappable::init(this); |
addToPropertyMap(m_dx); |
addToPropertyMap(m_dy); |
+ addToPropertyMap(m_in1); |
registerAnimatedPropertiesForSVGFEOffsetElement(); |
} |
@@ -72,14 +72,11 @@ void SVGFEOffsetElement::parseAttribute(const QualifiedName& name, const AtomicS |
return; |
} |
- if (name == SVGNames::inAttr) { |
- setIn1BaseValue(value); |
- return; |
- } |
- |
SVGParsingError parseError = NoError; |
- if (name == SVGNames::dxAttr) |
+ if (name == SVGNames::inAttr) |
+ m_in1->setBaseValueAsString(value, parseError); |
+ else if (name == SVGNames::dxAttr) |
m_dx->setBaseValueAsString(value, parseError); |
else if (name == SVGNames::dyAttr) |
m_dy->setBaseValueAsString(value, parseError); |
@@ -108,7 +105,7 @@ void SVGFEOffsetElement::svgAttributeChanged(const QualifiedName& attrName) |
PassRefPtr<FilterEffect> SVGFEOffsetElement::build(SVGFilterBuilder* filterBuilder, Filter* filter) |
{ |
- FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(in1CurrentValue())); |
+ FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->currentValue()->value())); |
if (!input1) |
return 0; |