| Index: Source/core/svg/SVGAnimatedColor.cpp
|
| diff --git a/Source/core/svg/SVGAnimatedColor.cpp b/Source/core/svg/SVGAnimatedColor.cpp
|
| index 969f28b9310f8c563918e05265e849ae42da0c2d..cf443a0840c0430f6b0a908eb4ba378cebfe237f 100644
|
| --- a/Source/core/svg/SVGAnimatedColor.cpp
|
| +++ b/Source/core/svg/SVGAnimatedColor.cpp
|
| @@ -32,7 +32,7 @@ String SVGColorProperty::valueAsString() const
|
| return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.color().serializedAsCSSComponentValue();
|
| }
|
|
|
| -PassRefPtr<NewSVGPropertyBase> SVGColorProperty::cloneForAnimation(const String&) const
|
| +PassRefPtr<SVGPropertyBase> SVGColorProperty::cloneForAnimation(const String&) const
|
| {
|
| // SVGAnimatedColor is deprecated. So No SVG DOM animation.
|
| ASSERT_NOT_REACHED();
|
| @@ -48,7 +48,7 @@ static inline Color fallbackColorForCurrentColor(SVGElement* targetElement)
|
| return Color::transparent;
|
| }
|
|
|
| -void SVGColorProperty::add(PassRefPtr<NewSVGPropertyBase> other, SVGElement* contextElement)
|
| +void SVGColorProperty::add(PassRefPtr<SVGPropertyBase> other, SVGElement* contextElement)
|
| {
|
| ASSERT(contextElement);
|
|
|
| @@ -58,7 +58,7 @@ void SVGColorProperty::add(PassRefPtr<NewSVGPropertyBase> other, SVGElement* con
|
| m_styleColor = StyleColor(ColorDistance::addColors(fromColor, toColor));
|
| }
|
|
|
| -void SVGColorProperty::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> fromValue, PassRefPtr<NewSVGPropertyBase> toValue, PassRefPtr<NewSVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement)
|
| +void SVGColorProperty::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> fromValue, PassRefPtr<SVGPropertyBase> toValue, PassRefPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement)
|
| {
|
| StyleColor fromStyleColor = toSVGColorProperty(fromValue)->m_styleColor;
|
| StyleColor toStyleColor = toSVGColorProperty(toValue)->m_styleColor;
|
| @@ -88,7 +88,7 @@ void SVGColorProperty::calculateAnimatedValue(SVGAnimationElement* animationElem
|
| m_styleColor = StyleColor(makeRGBA(roundf(animatedRed), roundf(animatedGreen), roundf(animatedBlue), roundf(animatedAlpha)));
|
| }
|
|
|
| -float SVGColorProperty::calculateDistance(PassRefPtr<NewSVGPropertyBase> toValue, SVGElement* contextElement)
|
| +float SVGColorProperty::calculateDistance(PassRefPtr<SVGPropertyBase> toValue, SVGElement* contextElement)
|
| {
|
| ASSERT(contextElement);
|
| Color fallbackColor = fallbackColorForCurrentColor(contextElement);
|
|
|