| Index: third_party/WebKit/Source/core/svg/SVGAngle.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGAngle.cpp b/third_party/WebKit/Source/core/svg/SVGAngle.cpp
|
| index 9ed9554334b88b8cadfa6410443c5229ca0be108..157b63a0fa812be1aa0091715f6292669a3b06e9 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGAngle.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/SVGAngle.cpp
|
| @@ -66,19 +66,19 @@ void SVGMarkerOrientEnumeration::notifyChange()
|
| m_angle->orientTypeChanged();
|
| }
|
|
|
| -void SVGMarkerOrientEnumeration::add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*)
|
| +void SVGMarkerOrientEnumeration::add(RawPtr<SVGPropertyBase>, SVGElement*)
|
| {
|
| // SVGMarkerOrientEnumeration is only animated via SVGAngle
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|
| -void SVGMarkerOrientEnumeration::calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement)
|
| +void SVGMarkerOrientEnumeration::calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, RawPtr<SVGPropertyBase> from, RawPtr<SVGPropertyBase> to, RawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement)
|
| {
|
| // SVGMarkerOrientEnumeration is only animated via SVGAngle
|
| ASSERT_NOT_REACHED();
|
| }
|
|
|
| -float SVGMarkerOrientEnumeration::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement* contextElement)
|
| +float SVGMarkerOrientEnumeration::calculateDistance(RawPtr<SVGPropertyBase> to, SVGElement* contextElement)
|
| {
|
| // SVGMarkerOrientEnumeration is only animated via SVGAngle
|
| ASSERT_NOT_REACHED();
|
| @@ -110,9 +110,9 @@ DEFINE_TRACE(SVGAngle)
|
| SVGPropertyHelper<SVGAngle>::trace(visitor);
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<SVGAngle> SVGAngle::clone() const
|
| +RawPtr<SVGAngle> SVGAngle::clone() const
|
| {
|
| - return adoptRefWillBeNoop(new SVGAngle(m_unitType, m_valueInSpecifiedUnits, m_orientType->enumValue()));
|
| + return new SVGAngle(m_unitType, m_valueInSpecifiedUnits, m_orientType->enumValue());
|
| }
|
|
|
| float SVGAngle::value() const
|
| @@ -366,9 +366,9 @@ void SVGAngle::convertToSpecifiedUnits(SVGAngleType unitType)
|
| m_orientType->setEnumValue(SVGMarkerOrientAngle);
|
| }
|
|
|
| -void SVGAngle::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
|
| +void SVGAngle::add(RawPtr<SVGPropertyBase> other, SVGElement*)
|
| {
|
| - RefPtrWillBeRawPtr<SVGAngle> otherAngle = toSVGAngle(other);
|
| + RawPtr<SVGAngle> otherAngle = toSVGAngle(other);
|
|
|
| // Only respect by animations, if from and by are both specified in angles (and not eg. 'auto').
|
| if (orientType()->enumValue() != SVGMarkerOrientAngle || otherAngle->orientType()->enumValue() != SVGMarkerOrientAngle)
|
| @@ -386,13 +386,13 @@ void SVGAngle::assign(const SVGAngle& other)
|
| m_orientType->setEnumValue(otherOrientType);
|
| }
|
|
|
| -void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDuration, SVGElement*)
|
| +void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, RawPtr<SVGPropertyBase> from, RawPtr<SVGPropertyBase> to, RawPtr<SVGPropertyBase> toAtEndOfDuration, SVGElement*)
|
| {
|
| ASSERT(animationElement);
|
| bool isToAnimation = animationElement->getAnimationMode() == ToAnimation;
|
|
|
| - RefPtrWillBeRawPtr<SVGAngle> fromAngle = isToAnimation ? PassRefPtrWillBeRawPtr<SVGAngle>(this) : toSVGAngle(from);
|
| - RefPtrWillBeRawPtr<SVGAngle> toAngle = toSVGAngle(to);
|
| + RawPtr<SVGAngle> fromAngle = isToAnimation ? RawPtr<SVGAngle>(this) : toSVGAngle(from);
|
| + RawPtr<SVGAngle> toAngle = toSVGAngle(to);
|
| SVGMarkerOrientType fromOrientType = fromAngle->orientType()->enumValue();
|
| SVGMarkerOrientType toOrientType = toAngle->orientType()->enumValue();
|
|
|
| @@ -413,7 +413,7 @@ void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, flo
|
| case SVGMarkerOrientAngle:
|
| {
|
| float animatedValue = value();
|
| - RefPtrWillBeRawPtr<SVGAngle> toAtEndOfDurationAngle = toSVGAngle(toAtEndOfDuration);
|
| + RawPtr<SVGAngle> toAtEndOfDurationAngle = toSVGAngle(toAtEndOfDuration);
|
|
|
| animationElement->animateAdditiveNumber(percentage, repeatCount, fromAngle->value(), toAngle->value(), toAtEndOfDurationAngle->value(), animatedValue);
|
| orientType()->setEnumValue(SVGMarkerOrientAngle);
|
| @@ -429,7 +429,7 @@ void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, flo
|
| }
|
| }
|
|
|
| -float SVGAngle::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
|
| +float SVGAngle::calculateDistance(RawPtr<SVGPropertyBase> other, SVGElement*)
|
| {
|
| return fabsf(value() - toSVGAngle(other)->value());
|
| }
|
|
|