Index: Source/core/svg/SVGFESpecularLightingElement.cpp |
diff --git a/Source/core/svg/SVGFESpecularLightingElement.cpp b/Source/core/svg/SVGFESpecularLightingElement.cpp |
index eed8e0507c632c39091acd104b98be532307571d..21782cfdeed37cda012724cc8adf6f169607336b 100644 |
--- a/Source/core/svg/SVGFESpecularLightingElement.cpp |
+++ b/Source/core/svg/SVGFESpecularLightingElement.cpp |
@@ -32,10 +32,8 @@ |
namespace WebCore { |
// Animated property definitions |
-DEFINE_ANIMATED_STRING(SVGFESpecularLightingElement, SVGNames::inAttr, In1, in1) |
BEGIN_REGISTER_ANIMATED_PROPERTIES(SVGFESpecularLightingElement) |
- REGISTER_LOCAL_ANIMATED_PROPERTY(in1) |
REGISTER_PARENT_ANIMATED_PROPERTIES(SVGFilterPrimitiveStandardAttributes) |
END_REGISTER_ANIMATED_PROPERTIES |
@@ -45,6 +43,7 @@ inline SVGFESpecularLightingElement::SVGFESpecularLightingElement(Document& docu |
, m_specularExponent(SVGAnimatedNumber::create(this, SVGNames::specularExponentAttr, SVGNumber::create(1))) |
, m_surfaceScale(SVGAnimatedNumber::create(this, SVGNames::surfaceScaleAttr, SVGNumber::create(1))) |
, m_kernelUnitLength(SVGAnimatedNumberOptionalNumber::create(this, SVGNames::surfaceScaleAttr)) |
+ , m_in1(SVGAnimatedString::create(this, SVGNames::inAttr, SVGString::create())) |
{ |
ScriptWrappable::init(this); |
@@ -52,6 +51,7 @@ inline SVGFESpecularLightingElement::SVGFESpecularLightingElement(Document& docu |
addToPropertyMap(m_specularExponent); |
addToPropertyMap(m_surfaceScale); |
addToPropertyMap(m_kernelUnitLength); |
+ addToPropertyMap(m_in1); |
registerAnimatedPropertiesForSVGFESpecularLightingElement(); |
} |
@@ -80,14 +80,11 @@ void SVGFESpecularLightingElement::parseAttribute(const QualifiedName& name, con |
return; |
} |
- if (name == SVGNames::inAttr) { |
- setIn1BaseValue(value); |
- return; |
- } |
- |
SVGParsingError parseError = NoError; |
- if (name == SVGNames::surfaceScaleAttr) |
+ if (name == SVGNames::inAttr) |
+ m_in1->setBaseValueAsString(value, parseError); |
+ else if (name == SVGNames::surfaceScaleAttr) |
m_surfaceScale->setBaseValueAsString(value, parseError); |
else if (name == SVGNames::specularConstantAttr) |
m_specularConstant->setBaseValueAsString(value, parseError); |
@@ -184,7 +181,7 @@ void SVGFESpecularLightingElement::lightElementAttributeChanged(const SVGFELight |
PassRefPtr<FilterEffect> SVGFESpecularLightingElement::build(SVGFilterBuilder* filterBuilder, Filter* filter) |
{ |
- FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(in1CurrentValue())); |
+ FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->currentValue()->value())); |
if (!input1) |
return 0; |