| Index: third_party/WebKit/Source/core/svg/SVGRect.cpp
|
| diff --git a/third_party/WebKit/Source/core/svg/SVGRect.cpp b/third_party/WebKit/Source/core/svg/SVGRect.cpp
|
| index 131aa14388611996269489b35ee3808446f02624..b9f7e30d959323c7759e51612d526a65ca1e7f53 100644
|
| --- a/third_party/WebKit/Source/core/svg/SVGRect.cpp
|
| +++ b/third_party/WebKit/Source/core/svg/SVGRect.cpp
|
| @@ -39,7 +39,7 @@ SVGRect::SVGRect(const FloatRect& rect)
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<SVGRect> SVGRect::clone() const
|
| +RawPtr<SVGRect> SVGRect::clone() const
|
| {
|
| return SVGRect::create(m_value);
|
| }
|
| @@ -104,17 +104,17 @@ String SVGRect::valueAsString() const
|
| return builder.toString();
|
| }
|
|
|
| -void SVGRect::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*)
|
| +void SVGRect::add(RawPtr<SVGPropertyBase> other, SVGElement*)
|
| {
|
| m_value += toSVGRect(other)->value();
|
| }
|
|
|
| -void SVGRect::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fromValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*)
|
| +void SVGRect::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, RawPtr<SVGPropertyBase> fromValue, RawPtr<SVGPropertyBase> toValue, RawPtr<SVGPropertyBase> toAtEndOfDurationValue, SVGElement*)
|
| {
|
| ASSERT(animationElement);
|
| - RefPtrWillBeRawPtr<SVGRect> fromRect = animationElement->getAnimationMode() == ToAnimation ? PassRefPtrWillBeRawPtr<SVGRect>(this) : toSVGRect(fromValue);
|
| - RefPtrWillBeRawPtr<SVGRect> toRect = toSVGRect(toValue);
|
| - RefPtrWillBeRawPtr<SVGRect> toAtEndOfDurationRect = toSVGRect(toAtEndOfDurationValue);
|
| + RawPtr<SVGRect> fromRect = animationElement->getAnimationMode() == ToAnimation ? RawPtr<SVGRect>(this) : toSVGRect(fromValue);
|
| + RawPtr<SVGRect> toRect = toSVGRect(toValue);
|
| + RawPtr<SVGRect> toAtEndOfDurationRect = toSVGRect(toAtEndOfDurationValue);
|
|
|
| float animatedX = x();
|
| float animatedY = y();
|
| @@ -128,7 +128,7 @@ void SVGRect::calculateAnimatedValue(SVGAnimationElement* animationElement, floa
|
| m_value = FloatRect(animatedX, animatedY, animatedWidth, animatedHeight);
|
| }
|
|
|
| -float SVGRect::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGElement* contextElement)
|
| +float SVGRect::calculateDistance(RawPtr<SVGPropertyBase> to, SVGElement* contextElement)
|
| {
|
| // FIXME: Distance calculation is not possible for SVGRect right now. We need the distance for every single value.
|
| return -1;
|
|
|