Index: Source/core/svg/SVGFESpecularLightingElement.cpp |
diff --git a/Source/core/svg/SVGFESpecularLightingElement.cpp b/Source/core/svg/SVGFESpecularLightingElement.cpp |
index 958903249d7f9486a8ffd4b9aecdccd688660869..351904311771f709ca453f73af0427340ed6bfe6 100644 |
--- a/Source/core/svg/SVGFESpecularLightingElement.cpp |
+++ b/Source/core/svg/SVGFESpecularLightingElement.cpp |
@@ -142,11 +142,11 @@ bool SVGFESpecularLightingElement::setFilterEffectAttribute(FilterEffect* effect |
return specularLighting->setLightingColor(renderer->style()->svgStyle()->lightingColor()); |
} |
if (attrName == SVGNames::surfaceScaleAttr) |
- return specularLighting->setSurfaceScale(surfaceScale()); |
+ return specularLighting->setSurfaceScale(surfaceScaleCurrentValue()); |
if (attrName == SVGNames::specularConstantAttr) |
- return specularLighting->setSpecularConstant(specularConstant()); |
+ return specularLighting->setSpecularConstant(specularConstantCurrentValue()); |
if (attrName == SVGNames::specularExponentAttr) |
- return specularLighting->setSpecularExponent(specularExponent()); |
+ return specularLighting->setSpecularExponent(specularExponentCurrentValue()); |
LightSource* lightSource = const_cast<LightSource*>(specularLighting->lightSource()); |
const SVGFELightElement* lightElement = SVGFELightElement::findLightElement(this); |
@@ -154,25 +154,25 @@ bool SVGFESpecularLightingElement::setFilterEffectAttribute(FilterEffect* effect |
ASSERT(lightElement); |
if (attrName == SVGNames::azimuthAttr) |
- return lightSource->setAzimuth(lightElement->azimuth()); |
+ return lightSource->setAzimuth(lightElement->azimuthCurrentValue()); |
if (attrName == SVGNames::elevationAttr) |
- return lightSource->setElevation(lightElement->elevation()); |
+ return lightSource->setElevation(lightElement->elevationCurrentValue()); |
if (attrName == SVGNames::xAttr) |
- return lightSource->setX(lightElement->x()); |
+ return lightSource->setX(lightElement->xCurrentValue()); |
if (attrName == SVGNames::yAttr) |
- return lightSource->setY(lightElement->y()); |
+ return lightSource->setY(lightElement->yCurrentValue()); |
if (attrName == SVGNames::zAttr) |
- return lightSource->setZ(lightElement->z()); |
+ return lightSource->setZ(lightElement->zCurrentValue()); |
if (attrName == SVGNames::pointsAtXAttr) |
- return lightSource->setPointsAtX(lightElement->pointsAtX()); |
+ return lightSource->setPointsAtX(lightElement->pointsAtXCurrentValue()); |
if (attrName == SVGNames::pointsAtYAttr) |
- return lightSource->setPointsAtY(lightElement->pointsAtY()); |
+ return lightSource->setPointsAtY(lightElement->pointsAtYCurrentValue()); |
if (attrName == SVGNames::pointsAtZAttr) |
- return lightSource->setPointsAtZ(lightElement->pointsAtZ()); |
+ return lightSource->setPointsAtZ(lightElement->pointsAtZCurrentValue()); |
if (attrName == SVGNames::specularExponentAttr) |
- return lightSource->setSpecularExponent(lightElement->specularExponent()); |
+ return lightSource->setSpecularExponent(lightElement->specularExponentCurrentValue()); |
if (attrName == SVGNames::limitingConeAngleAttr) |
- return lightSource->setLimitingConeAngle(lightElement->limitingConeAngle()); |
+ return lightSource->setLimitingConeAngle(lightElement->limitingConeAngleCurrentValue()); |
ASSERT_NOT_REACHED(); |
return false; |
@@ -214,7 +214,7 @@ void SVGFESpecularLightingElement::lightElementAttributeChanged(const SVGFELight |
PassRefPtr<FilterEffect> SVGFESpecularLightingElement::build(SVGFilterBuilder* filterBuilder, Filter* filter) |
{ |
- FilterEffect* input1 = filterBuilder->getEffectById(in1()); |
+ FilterEffect* input1 = filterBuilder->getEffectById(in1CurrentValue()); |
if (!input1) |
return 0; |
@@ -230,8 +230,8 @@ PassRefPtr<FilterEffect> SVGFESpecularLightingElement::build(SVGFilterBuilder* f |
ASSERT(renderer->style()); |
Color color = renderer->style()->svgStyle()->lightingColor(); |
- RefPtr<FilterEffect> effect = FESpecularLighting::create(filter, color, surfaceScale(), specularConstant(), |
- specularExponent(), kernelUnitLengthX(), kernelUnitLengthY(), lightSource.release()); |
+ RefPtr<FilterEffect> effect = FESpecularLighting::create(filter, color, surfaceScaleCurrentValue(), specularConstantCurrentValue(), |
+ specularExponentCurrentValue(), kernelUnitLengthXCurrentValue(), kernelUnitLengthYCurrentValue(), lightSource.release()); |
effect->inputEffects().append(input1); |
return effect.release(); |
} |